diff options
author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-03-16 22:31:43 +0100 |
---|---|---|
committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2014-03-16 22:31:43 +0100 |
commit | e97400b2dca787ff4993111940a19546a6000c5e (patch) | |
tree | 27329c0a9f9ae78acabb749b46eb387e03d96b3e | |
parent | 9ecfe9507b7abb357a3fbf573a4c1975bc1dca0f (diff) | |
download | embtoolkit-e97400b2dca787ff4993111940a19546a6000c5e.tar.gz embtoolkit-e97400b2dca787ff4993111940a19546a6000c5e.tar.bz2 embtoolkit-e97400b2dca787ff4993111940a19546a6000c5e.tar.xz |
Byuild system: move zlib host under packages/htools/
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r-- | mk/packages.mk | 4 | ||||
-rw-r--r-- | packages/htools/hosttools-buildopts.kconfig | 10 | ||||
-rw-r--r-- | packages/htools/hosttools-buildopts.mk | 3 | ||||
-rw-r--r-- | packages/htools/zlib/zlib.kconfig (renamed from kconfig/zlib_host.kconfig) | 0 | ||||
-rw-r--r-- | packages/htools/zlib/zlib.mk (renamed from mk/zlib_host.mk) | 6 |
5 files changed, 11 insertions, 12 deletions
diff --git a/mk/packages.mk b/mk/packages.mk index d9ea6b1..9ff4313 100644 --- a/mk/packages.mk +++ b/mk/packages.mk @@ -43,10 +43,6 @@ include mk/mkimage.mk include mk/mtd-utils.mk include mk/squashfs.mk -# zlib_host -include mk/zlib_host.mk -HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_ZLIB) += zlib_host_install - # Install various tools in case of FreeBSD host development machine ifeq ($(embtk_buildhost_os_type),bsd) HOSTTOOLS_COMPONENTS-y += gsed_install gmake_install diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig index b4bb986..1f7eced 100644 --- a/packages/htools/hosttools-buildopts.kconfig +++ b/packages/htools/hosttools-buildopts.kconfig @@ -75,11 +75,6 @@ config EMBTK_HAVE_MKIMAGE u-boot mkimage tool. # -# zlib for host -# -source kconfig/zlib_host.kconfig - -# # gperf for host # source kconfig/gperf_host.kconfig @@ -146,3 +141,8 @@ source kconfig/gperf_host.kconfig # libelf # source packages/misc/libelf/libelf.kconfig + +# +# zlib for host +# +source packages/htools/zlib/zlib.kconfig diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk index 5cbeb29..56df4f5 100644 --- a/packages/htools/hosttools-buildopts.mk +++ b/packages/htools/hosttools-buildopts.mk @@ -35,3 +35,6 @@ $(call embtk_include_hostpkg,fakeroot_host) # pkgconf include packages/htools/pkgconf/vars.mk $(call embtk_include_hostpkg,pkgconf_host) + +# zlib +$(call embtk_include_hostpkg,zlib_host) diff --git a/kconfig/zlib_host.kconfig b/packages/htools/zlib/zlib.kconfig index 75a73e9..75a73e9 100644 --- a/kconfig/zlib_host.kconfig +++ b/packages/htools/zlib/zlib.kconfig diff --git a/mk/zlib_host.mk b/packages/htools/zlib/zlib.mk index 3b43a1b..79fa28c 100644 --- a/mk/zlib_host.mk +++ b/packages/htools/zlib/zlib.mk @@ -33,14 +33,14 @@ ZLIB_HOST_BUILD_DIR := $(embtk_toolsb)/zlib-$(ZLIB_HOST_VERSION) ZLIB_HOST_CONFIGURE_ENV := CC=$(HOSTCC_CACHED) define embtk_install_zlib_host - $(call embtk_makeinstall_hostpkg,zlib_host) + $(call embtk_makeinstall_hostpkg,zlib_host) endef define embtk_configure_zlib_host - $(Q)cd $(ZLIB_HOST_BUILD_DIR); \ + $(Q)cd $(ZLIB_HOST_BUILD_DIR); \ CPPFLAGS="-I$(embtk_htools)/usr/include" \ LDFLAGS="-L$(embtk_htools)/$(LIBDIR) -L$(embtk_htools)/usr/$(LIBDIR)" \ - $(ZLIB_HOST_CONFIGURE_ENV) \ + $(ZLIB_HOST_CONFIGURE_ENV) \ $(CONFIG_EMBTK_SHELL) $(ZLIB_HOST_SRC_DIR)/configure \ --prefix=$(embtk_htools)/usr $(ZLIB_HOST_CONFIGURE_OPTS) $(call __embtk_setconfigured_pkg,zlib_host) |