diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-07-20 21:41:41 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-07-20 21:41:41 +0200 |
| commit | 043f1095fcd292a19f9d518aa2d9fc863fd1f897 (patch) | |
| tree | b39c2391033c3ad647df61ae8f3b68bdf7bbf753 | |
| parent | 2fc6f3ebb9359cdf52800a7a29b2ad53c8be1ef1 (diff) | |
| download | embtoolkit-043f1095fcd292a19f9d518aa2d9fc863fd1f897.tar.gz embtoolkit-043f1095fcd292a19f9d518aa2d9fc863fd1f897.tar.bz2 embtoolkit-043f1095fcd292a19f9d518aa2d9fc863fd1f897.tar.xz | |
Build system: avoid use of CONFIG_SHELL variable, it is used autoconf scripts
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | mk/buildsystem.mk | 1 | ||||
| -rw-r--r-- | mk/eglibc.mk | 4 | ||||
| -rw-r--r-- | mk/macros.packages.mk | 4 | ||||
| -rw-r--r-- | mk/zlib_host.mk | 2 | ||||
| -rw-r--r-- | packages/compression/zlib/zlib.mk | 2 | ||||
| -rw-r--r-- | packages/security/openssl/openssl.mk | 2 |
7 files changed, 10 insertions, 11 deletions
@@ -45,10 +45,9 @@ export EMBTK_BUGURL EMBTK_HOMEURL EMBTK_VERSION EMBTK_ROOT := $(shell pwd) EMBTK_DOTCONFIG := $(EMBTK_ROOT)/.config -export EMBTK_ROOT EMBTK_DOTCONFIG # SHELL used by kbuild -CONFIG_SHELL := \ +CONFIG_EMBTK_SHELL := \ $(shell \ if [ -x "$$BASH" ]; then \ echo $$BASH; \ @@ -59,9 +58,8 @@ CONFIG_SHELL := \ echo /bin/sh; \ fi; \ fi) -export CONFIG_SHELL -HOST_ARCH := $(shell $(CONFIG_SHELL) $(EMBTK_ROOT)/scripts/config.guess) +HOST_ARCH := $(shell $(CONFIG_EMBTK_SHELL) $(EMBTK_ROOT)/scripts/config.guess) HOST_BUILD := $(HOST_ARCH) export HOST_ARCH HOST_BUILD diff --git a/mk/buildsystem.mk b/mk/buildsystem.mk index c767f3e..ff61ad5 100644 --- a/mk/buildsystem.mk +++ b/mk/buildsystem.mk @@ -53,6 +53,7 @@ define __embtk_kconfig_buildrun obj=$(EMBTK_ROOT)/scripts/kconfig \ EMBTK_DEFAULT_DL="$(EMBTK_ROOT)/dl/" \ EMBTK_VERSION=$(EMBTK_VERSION) \ + CONFIG_SHELL=$(CONFIG_EMBTK_SHELL) \ quiet=quiet_ KBUILD_VERBOSE=0 $(1) endef diff --git a/mk/eglibc.mk b/mk/eglibc.mk index 1cd022f..078c282 100644 --- a/mk/eglibc.mk +++ b/mk/eglibc.mk @@ -92,7 +92,7 @@ define embtk_configure_eglibc_headers NM=$(TARGETNM) \ OBJCOPY=$(TARGETOBJCOPY) \ OBJDUMP=$(TARGETDUMP) \ - $(CONFIG_SHELL) $(EGLIBC_SRC_DIR)/libc/configure \ + $(CONFIG_EMBTK_SHELL) $(EGLIBC_SRC_DIR)/libc/configure \ --prefix=/usr --with-headers=$(embtk_sysroot)/usr/include \ --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) \ @@ -142,7 +142,7 @@ define embtk_configure_eglibc NM=$(TARGETNM) \ OBJCOPY=$(TARGETOBJCOPY) \ OBJDUMP=$(TARGETDUMP) \ - $(CONFIG_SHELL) $(EGLIBC_SRC_DIR)/libc/configure \ + $(CONFIG_EMBTK_SHELL) $(EGLIBC_SRC_DIR)/libc/configure \ --prefix=/usr --with-headers=$(embtk_sysroot)/usr/include \ --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) \ diff --git a/mk/macros.packages.mk b/mk/macros.packages.mk index 5b10fa4..23945c6 100644 --- a/mk/macros.packages.mk +++ b/mk/macros.packages.mk @@ -344,7 +344,7 @@ define embtk_configure_pkg ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ $(__embtk_pkg_configureenv) \ - $(CONFIG_SHELL) $(__embtk_pkg_srcdir)/configure \ + $(CONFIG_EMBTK_SHELL) $(__embtk_pkg_srcdir)/configure \ --build=$(HOST_BUILD) --host=$(STRICT_GNU_TARGET) \ --target=$(STRICT_GNU_TARGET) --libdir=/usr/$(LIBDIR) \ --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-rpath \ @@ -380,7 +380,7 @@ define embtk_configure_hostpkg $(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CC=$(HOSTCC_CACHED)) \ $(if $(call __embtk_mk_strcmp,$(PKGV),CCACHE),,CXX=$(HOSTCXX_CACHED)) \ $(__embtk_pkg_configureenv) \ - $(CONFIG_SHELL) $(__embtk_pkg_srcdir)/configure \ + $(CONFIG_EMBTK_SHELL) $(__embtk_pkg_srcdir)/configure \ --build=$(HOST_BUILD) --host=$(HOST_ARCH) \ --prefix=$(strip $(if $(__embtk_pkg_prefix), \ $(__embtk_pkg_prefix),$(embtk_htools)/usr)) \ diff --git a/mk/zlib_host.mk b/mk/zlib_host.mk index ae06e95..61d5026 100644 --- a/mk/zlib_host.mk +++ b/mk/zlib_host.mk @@ -41,7 +41,7 @@ define embtk_configure_zlib_host CPPFLAGS="-I$(embtk_htools)/usr/include" \ LDFLAGS="-L$(embtk_htools)/$(LIBDIR) -L$(embtk_htools)/usr/$(LIBDIR)" \ $(ZLIB_HOST_CONFIGURE_ENV) \ - $(CONFIG_SHELL) $(ZLIB_HOST_SRC_DIR)/configure \ + $(CONFIG_EMBTK_SHELL) $(ZLIB_HOST_SRC_DIR)/configure \ --prefix=$(embtk_htools)/usr $(ZLIB_HOST_CONFIGURE_OPTS) touch $(call __embtk_pkg_dotconfigured_f,zlib_host) endef diff --git a/packages/compression/zlib/zlib.mk b/packages/compression/zlib/zlib.mk index aa26e94..ffccc14 100644 --- a/packages/compression/zlib/zlib.mk +++ b/packages/compression/zlib/zlib.mk @@ -64,7 +64,7 @@ define embtk_configure_zlib PKG_CONFIG=$(PKGCONFIG_BIN) \ PKG_CONFIG_PATH=$(EMBTK_PKG_CONFIG_PATH) \ $(ZLIB_CONFIGURE_ENV) \ - $(CONFIG_SHELL) $(ZLIB_SRC_DIR)/configure \ + $(CONFIG_EMBTK_SHELL) $(ZLIB_SRC_DIR)/configure \ --libdir=/usr/$(LIBDIR) --prefix=/usr --sysconfdir=/etc \ $(ZLIB_CONFIGURE_OPTS) $(Q)touch $(ZLIB_BUILD_DIR)/.configured diff --git a/packages/security/openssl/openssl.mk b/packages/security/openssl/openssl.mk index 4abaf7b..057a816 100644 --- a/packages/security/openssl/openssl.mk +++ b/packages/security/openssl/openssl.mk @@ -61,7 +61,7 @@ openssl_install: define embtk_beforeinstall_openssl $(Q)rm -rf $(OPENSSL_BUILD_DIR)/.postinstalled $(Q)cd $(OPENSSL_BUILD_DIR); \ - $(CONFIG_SHELL) $(OPENSSL_SRC_DIR)/Configure $(OPENSSL_LINUX_TARGET) \ + $(CONFIG_EMBTK_SHELL) $(OPENSSL_SRC_DIR)/Configure $(OPENSSL_LINUX_TARGET) \ --openssldir=/etc/ssl --prefix=/usr shared endef |