diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-05-16 07:41:21 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-05-16 07:41:59 +0200 |
| commit | 00d0bd7bb44a630bf75dc6197713c01623473404 (patch) | |
| tree | 75491c9d47d0aaf2b5d1315859ea4413a08a6fa5 /core/mk/pkg-macros | |
| parent | 57ff336682730a8ea82d66e48f0ff61a86672e9d (diff) | |
| download | embtoolkit-00d0bd7bb44a630bf75dc6197713c01623473404.tar.gz embtoolkit-00d0bd7bb44a630bf75dc6197713c01623473404.tar.bz2 embtoolkit-00d0bd7bb44a630bf75dc6197713c01623473404.tar.xz | |
Build system: waf package support: use own package waf script and do not --out
this hopefully fixes error reported by Ricardo Crudo
http://embtk-users.4674.n7.nabble.com/embtk-users-Initial-waf-based-packages-support-td23.html
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'core/mk/pkg-macros')
| -rw-r--r-- | core/mk/pkg-macros/configure.mk | 6 | ||||
| -rw-r--r-- | core/mk/pkg-macros/install.mk | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/core/mk/pkg-macros/configure.mk b/core/mk/pkg-macros/configure.mk index 2761c7b..5d2151c 100644 --- a/core/mk/pkg-macros/configure.mk +++ b/core/mk/pkg-macros/configure.mk @@ -170,9 +170,8 @@ define embtk_wafconfigure_pkg PKG_CONFIG_PATH="$(EMBTK_PKG_CONFIG_PATH)" \ PKG_CONFIG_LIBDIR="$(EMBTK_PKG_CONFIG_LIBDIR)" \ $(__embtk_pkg_configureenv) $(__embtk_pkg_scanbuild) \ - $(embtk_waf) configure \ + ./waf configure \ --prefix=/usr \ - --out=$(__embtk_pkg_builddir) \ $(__embtk_pkg_configureopts) $(Q)$(call __embtk_setconfigured_pkg,$(1)) endef @@ -193,10 +192,9 @@ define embtk_wafconfigure_hostpkg $(if $(__embtk_pkg_noccache),,CC=$(HOSTCC_CACHED)) \ $(if $(__embtk_pkg_noccache),,CXX=$(HOSTCXX_CACHED)) \ $(__embtk_pkg_configureenv) \ - $(embtk_waf) configure \ + ./waf configure \ --prefix=$(strip $(if $(__embtk_pkg_prefix), \ $(__embtk_pkg_prefix),$(embtk_htools)/usr)) \ - --out=$(__embtk_pkg_builddir) \ $(__embtk_pkg_configureopts) $(Q)$(call __embtk_setconfigured_pkg,$(1)) endef diff --git a/core/mk/pkg-macros/install.mk b/core/mk/pkg-macros/install.mk index 79d6c98..476155a 100644 --- a/core/mk/pkg-macros/install.mk +++ b/core/mk/pkg-macros/install.mk @@ -210,16 +210,13 @@ define __embtk_install_hostpkg_make $(call __embtk_postinstall_pkg,$(1)) endef -__embtk_waf_build = cd $(__embtk_pkg_builddir); \ - $(embtk_waf) build $(J) --progress +__embtk_waf_build = cd $(__embtk_pkg_srcdir); ./waf build $(J) --progress -__embtk_waf_install = cd $(__embtk_pkg_builddir); \ - $(embtk_waf) install --progress \ +__embtk_waf_install = cd $(__embtk_pkg_srcdir); ./waf install --progress \ $(if $(__embtk_pkg_nodestdir),, \ --destdir=$(embtk_sysroot)$(if $(__embtk_pkg_sysrootsuffix),/$(__embtk_pkg_sysrootsuffix))) -__embtk_waf_hostinstall = cd $(__embtk_pkg_builddir); \ - $(embtk_waf) install --progress \ +__embtk_waf_hostinstall = cd $(__embtk_pkg_srcdir); ./waf install --progress \ $(if $(__embtk_pkg_destdir),--destdir=$(__embtk_pkg_destdir)) define __embtk_install_pkg_waf |