From 45c69819156bc0ca5276c22f0e46b4087d6fb63c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 25 Dec 2017 23:14:22 +0100 Subject: [PATCH] - rename HOSTPREFIX => HOST_DIR --- make/bootstrap.mk | 108 ++++++++++++++++++++++---------------------- make/clean.mk | 4 +- make/crosstool.mk | 4 +- make/environment.mk | 6 +-- make/system-libs.mk | 38 ++++++++-------- 5 files changed, 80 insertions(+), 80 deletions(-) diff --git a/make/bootstrap.mk b/make/bootstrap.mk index bb53ddaa..e6379db8 100644 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -1,6 +1,6 @@ # makefile to setup and initialize the final buildsystem -BOOTSTRAP = targetprefix $(D) $(BUILD_TMP) $(CROSS_DIR) $(STAGING_DIR) $(IMAGE_DIR) $(UPDATE_DIR) $(HOSTPREFIX)/bin includes-and-libs modules host-preqs +BOOTSTRAP = targetprefix $(D) $(BUILD_TMP) $(CROSS_DIR) $(STAGING_DIR) $(IMAGE_DIR) $(UPDATE_DIR) $(HOST_DIR)/bin includes-and-libs modules host-preqs BOOTSTRAP += $(TARGETLIB)/libc.so.6 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51)) @@ -42,10 +42,10 @@ $(CROSS_DIR) \ $(STAGING_DIR) \ $(IMAGE_DIR) \ $(UPDATE_DIR) \ -$(HOSTPREFIX): +$(HOST_DIR): mkdir -p $@ -$(HOSTPREFIX)/bin: $(HOSTPREFIX) +$(HOST_DIR)/bin: $(HOST_DIR) mkdir -p $@ $(STATICLIB): @@ -93,39 +93,39 @@ modules: $(TARGETLIB)/modules blobs: $(TARGETPREFIX)/var/update # helper target to create ccache links (make sure to have ccache installed in /usr/bin ;) -ccache: find-ccache $(CCACHE) $(HOSTPREFIX)/bin - @ln -sf $(CCACHE) $(HOSTPREFIX)/bin/cc - @ln -sf $(CCACHE) $(HOSTPREFIX)/bin/gcc - @ln -sf $(CCACHE) $(HOSTPREFIX)/bin/g++ - @ln -sf $(CCACHE) $(HOSTPREFIX)/bin/$(TARGET)-gcc - @ln -sf $(CCACHE) $(HOSTPREFIX)/bin/$(TARGET)-g++ +ccache: find-ccache $(CCACHE) $(HOST_DIR)/bin + @ln -sf $(CCACHE) $(HOST_DIR)/bin/cc + @ln -sf $(CCACHE) $(HOST_DIR)/bin/gcc + @ln -sf $(CCACHE) $(HOST_DIR)/bin/g++ + @ln -sf $(CCACHE) $(HOST_DIR)/bin/$(TARGET)-gcc + @ln -sf $(CCACHE) $(HOST_DIR)/bin/$(TARGET)-g++ # build all needed host-binaries host-preqs: pkg-config mkfs.jffs2 mkfs.fat sumtool mkimage zic parted_host mtools resize2fs ccache pkg-config-preqs: - @PATH=$(subst $(HOSTPREFIX)/bin:,,$(PATH)); \ + @PATH=$(subst $(HOST_DIR)/bin:,,$(PATH)); \ if ! pkg-config --exists glib-2.0; then \ echo "pkg-config and glib2-devel packages are needed for building cross-pkg-config."; false; \ fi -pkg-config: $(HOSTPREFIX)/bin/pkg-config -$(HOSTPREFIX)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(PKGCONF_VER).tar.gz | $(HOSTPREFIX)/bin pkg-config-preqs +pkg-config: $(HOST_DIR)/bin/pkg-config +$(HOST_DIR)/bin/pkg-config: $(ARCHIVE)/pkg-config-$(PKGCONF_VER).tar.gz | $(HOST_DIR)/bin pkg-config-preqs $(UNTAR)/pkg-config-$(PKGCONF_VER).tar.gz set -e; cd $(BUILD_TMP)/pkg-config-$(PKGCONF_VER); \ ./configure \ --with-pc_path=$(PKG_CONFIG_PATH); \ $(MAKE); \ - cp -a pkg-config $(HOSTPREFIX)/bin; \ - ln -sf pkg-config $(HOSTPREFIX)/bin/arm-cx2450x-linux-gnueabi-pkg-config - ln -sf pkg-config $(HOSTPREFIX)/bin/arm-cortex-linux-uclibcgnueabi-pkg-config - ln -sf pkg-config $(HOSTPREFIX)/bin/arm-cortex-linux-gnueabihf-pkg-config + cp -a pkg-config $(HOST_DIR)/bin; \ + ln -sf pkg-config $(HOST_DIR)/bin/arm-cx2450x-linux-gnueabi-pkg-config + ln -sf pkg-config $(HOST_DIR)/bin/arm-cortex-linux-uclibcgnueabi-pkg-config + ln -sf pkg-config $(HOST_DIR)/bin/arm-cortex-linux-gnueabihf-pkg-config $(REMOVE)/pkg-config-$(PKGCONF_VER) -mkfs.jffs2: $(HOSTPREFIX)/bin/mkfs.jffs2 -sumtool: $(HOSTPREFIX)/bin/sumtool -$(HOSTPREFIX)/bin/mkfs.jffs2 \ -$(HOSTPREFIX)/bin/sumtool: $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(HOSTPREFIX)/bin +mkfs.jffs2: $(HOST_DIR)/bin/mkfs.jffs2 +sumtool: $(HOST_DIR)/bin/sumtool +$(HOST_DIR)/bin/mkfs.jffs2 \ +$(HOST_DIR)/bin/sumtool: $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(HOST_DIR)/bin $(UNTAR)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 pushd $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER) && \ ./configure \ @@ -138,32 +138,32 @@ $(HOSTPREFIX)/bin/sumtool: $(ARCHIVE)/mtd-utils-$(MTD-UTILS_VER).tar.bz2 | $(HOS --without-xattr \ --disable-tests && \ $(MAKE) - install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/sumtool $(HOSTPREFIX)/bin/ - install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mkfs.jffs2 $(HOSTPREFIX)/bin/ + install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/sumtool $(HOST_DIR)/bin/ + install -D -m 0755 $(BUILD_TMP)/mtd-utils-$(MTD-UTILS_VER)/mkfs.jffs2 $(HOST_DIR)/bin/ $(REMOVE)/mtd-utils-$(MTD-UTILS_VER) -mkimage: $(HOSTPREFIX)/bin/mkimage -$(HOSTPREFIX)/bin/mkimage: $(ARCHIVE)/u-boot-$(U_BOOT_VER).tar.bz2 | $(HOSTPREFIX)/bin +mkimage: $(HOST_DIR)/bin/mkimage +$(HOST_DIR)/bin/mkimage: $(ARCHIVE)/u-boot-$(U_BOOT_VER).tar.bz2 | $(HOST_DIR)/bin $(UNTAR)/u-boot-$(U_BOOT_VER).tar.bz2 pushd $(BUILD_TMP)/u-boot-$(U_BOOT_VER) && \ $(MAKE) defconfig && \ $(MAKE) silentoldconfig && \ $(MAKE) tools-only - install -D -m 0755 $(BUILD_TMP)/u-boot-$(U_BOOT_VER)/tools/mkimage $(HOSTPREFIX)/bin/ + install -D -m 0755 $(BUILD_TMP)/u-boot-$(U_BOOT_VER)/tools/mkimage $(HOST_DIR)/bin/ $(REMOVE)/u-boot-$(U_BOOT_VER) -zic: $(HOSTPREFIX)/bin/zic -$(HOSTPREFIX)/bin/zic: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz $(ARCHIVE)/tzcode$(TZCODE_VER).tar.gz | $(HOSTPREFIX)/bin +zic: $(HOST_DIR)/bin/zic +$(HOST_DIR)/bin/zic: $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz $(ARCHIVE)/tzcode$(TZCODE_VER).tar.gz | $(HOST_DIR)/bin mkdir $(BUILD_TMP)/tzcode && \ tar -C $(BUILD_TMP)/tzcode -xf $(ARCHIVE)/tzcode$(TZCODE_VER).tar.gz tar -C $(BUILD_TMP)/tzcode -xf $(ARCHIVE)/tzdata$(TZDATA_VER).tar.gz pushd $(BUILD_TMP)/tzcode && \ $(MAKE) zic - install -D -m 0755 $(BUILD_TMP)/tzcode/zic $(HOSTPREFIX)/bin/ + install -D -m 0755 $(BUILD_TMP)/tzcode/zic $(HOST_DIR)/bin/ $(REMOVE)/tzcode -parted_host: $(HOSTPREFIX)/bin/parted -$(HOSTPREFIX)/bin/parted: $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(HOSTPREFIX)/bin +parted_host: $(HOST_DIR)/bin/parted +$(HOST_DIR)/bin/parted: $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(HOST_DIR)/bin $(UNTAR)/parted-$(PARTED_VER).tar.xz cd $(BUILD_TMP)/parted-$(PARTED_VER) && \ $(PATCH)/parted-3.2-devmapper-1.patch && \ @@ -175,50 +175,50 @@ $(HOSTPREFIX)/bin/parted: $(ARCHIVE)/parted-$(PARTED_VER).tar.xz | $(HOSTPREFIX) --disable-device-mapper \ --without-readline && \ $(MAKE) - install -D -m 0755 $(BUILD_TMP)/parted-$(PARTED_VER)/parted/parted $(HOSTPREFIX)/bin/ + install -D -m 0755 $(BUILD_TMP)/parted-$(PARTED_VER)/parted/parted $(HOST_DIR)/bin/ $(REMOVE)/parted-$(PARTED_VER) -mkfs.fat: $(HOSTPREFIX)/bin/mkfs.fat -$(HOSTPREFIX)/bin/mkfs.fat: $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(HOSTPREFIX)/bin +mkfs.fat: $(HOST_DIR)/bin/mkfs.fat +$(HOST_DIR)/bin/mkfs.fat: $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.xz | $(HOST_DIR)/bin $(UNTAR)/dosfstools-$(DOSFSTOOLS_VER).tar.xz set -e; cd $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER); \ ./configure \ --without-udev \ ; \ $(MAKE) - install -D -m 0755 $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER)/src/mkfs.fat $(HOSTPREFIX)/bin/ - ln -sf mkfs.fat $(HOSTPREFIX)/bin/mkfs.vfat - ln -sf mkfs.fat $(HOSTPREFIX)/bin/mkfs.msdos - ln -sf mkfs.fat $(HOSTPREFIX)/bin/mkdosfs + install -D -m 0755 $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER)/src/mkfs.fat $(HOST_DIR)/bin/ + ln -sf mkfs.fat $(HOST_DIR)/bin/mkfs.vfat + ln -sf mkfs.fat $(HOST_DIR)/bin/mkfs.msdos + ln -sf mkfs.fat $(HOST_DIR)/bin/mkdosfs $(REMOVE)/dosfstools-$(DOSFSTOOLS_VER) -mtools: $(HOSTPREFIX)/bin/mtools -$(HOSTPREFIX)/bin/mtools: $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz | $(HOSTPREFIX)/bin +mtools: $(HOST_DIR)/bin/mtools +$(HOST_DIR)/bin/mtools: $(ARCHIVE)/mtools-$(MTOOLS_VER).tar.gz | $(HOST_DIR)/bin $(UNTAR)/mtools-$(MTOOLS_VER).tar.gz set -e; cd $(BUILD_TMP)/mtools-$(MTOOLS_VER); \ ./configure; \ $(MAKE) - install -D -m 0755 $(BUILD_TMP)/mtools-$(MTOOLS_VER)/mtools $(HOSTPREFIX)/bin/ - ln -sf mtools $(HOSTPREFIX)/bin/mcopy + install -D -m 0755 $(BUILD_TMP)/mtools-$(MTOOLS_VER)/mtools $(HOST_DIR)/bin/ + ln -sf mtools $(HOST_DIR)/bin/mcopy $(REMOVE)/mtools-$(MTOOLS_VER) -resize2fs: $(HOSTPREFIX)/bin/resize2fs -$(HOSTPREFIX)/bin/resize2fs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(HOSTPREFIX)/bin +resize2fs: $(HOST_DIR)/bin/resize2fs +$(HOST_DIR)/bin/resize2fs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(HOST_DIR)/bin $(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER) && \ ./configure; \ $(MAKE) - install -D -m 0755 $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER)/resize/resize2fs $(HOSTPREFIX)/bin/ - install -D -m 0755 $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER)/misc/mke2fs $(HOSTPREFIX)/bin/ - ln -sf mke2fs $(HOSTPREFIX)/bin/mkfs.ext2 - ln -sf mke2fs $(HOSTPREFIX)/bin/mkfs.ext3 - ln -sf mke2fs $(HOSTPREFIX)/bin/mkfs.ext4 - ln -sf mke2fs $(HOSTPREFIX)/bin/mkfs.ext4dev - install -D -m 0755 $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER)/e2fsck/e2fsck $(HOSTPREFIX)/bin/ - ln -sf e2fsck $(HOSTPREFIX)/bin/fsck.ext2 - ln -sf e2fsck $(HOSTPREFIX)/bin/fsck.ext3 - ln -sf e2fsck $(HOSTPREFIX)/bin/fsck.ext4 - ln -sf e2fsck $(HOSTPREFIX)/bin/fsck.ext4dev + install -D -m 0755 $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER)/resize/resize2fs $(HOST_DIR)/bin/ + install -D -m 0755 $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER)/misc/mke2fs $(HOST_DIR)/bin/ + ln -sf mke2fs $(HOST_DIR)/bin/mkfs.ext2 + ln -sf mke2fs $(HOST_DIR)/bin/mkfs.ext3 + ln -sf mke2fs $(HOST_DIR)/bin/mkfs.ext4 + ln -sf mke2fs $(HOST_DIR)/bin/mkfs.ext4dev + install -D -m 0755 $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER)/e2fsck/e2fsck $(HOST_DIR)/bin/ + ln -sf e2fsck $(HOST_DIR)/bin/fsck.ext2 + ln -sf e2fsck $(HOST_DIR)/bin/fsck.ext3 + ln -sf e2fsck $(HOST_DIR)/bin/fsck.ext4 + ln -sf e2fsck $(HOST_DIR)/bin/fsck.ext4dev $(REMOVE)/e2fsprogs-$(E2FSPROGS_VER) # hack to make sure they are always copied diff --git a/make/clean.mk b/make/clean.mk index 7cb4eb50..15f15c82 100644 --- a/make/clean.mk +++ b/make/clean.mk @@ -12,10 +12,10 @@ static-clean: -rm -rf $(STATIC_DIR) all-clean: rebuild-clean staging-clean static-clean - @echo -e "\n$(TERM_RED_BOLD)Any other key then CTRL-C will now remove CROSS_BASE and HOSTPREFIX$(TERM_NORMAL)" + @echo -e "\n$(TERM_RED_BOLD)Any other key then CTRL-C will now remove CROSS_BASE and HOST_DIR$(TERM_NORMAL)" @read -rm -rf $(CROSS_BASE) - -rm -rf $(HOSTPREFIX) + -rm -rf $(HOST_DIR) %-clean: cd $(D) && find . -name $(subst -clean,,$@) -delete diff --git a/make/crosstool.mk b/make/crosstool.mk index 73fccd09..efb2439e 100644 --- a/make/crosstool.mk +++ b/make/crosstool.mk @@ -17,8 +17,8 @@ crosstools-renew: make ccache-clean BOXSERIES=hd51 make static-clean BOXSERIES=hd51 rm -rf $(BASE_DIR)/cross/$(BOXARCH)/hd51 - rm -rf $(HOSTPREFIX)/bin/arm-* - rm -rf $(HOSTPREFIX)/bin/pkg-config + rm -rf $(HOST_DIR)/bin/arm-* + rm -rf $(HOST_DIR)/bin/pkg-config rm -rf $(BASE_DIR)/static make crosstools make bootstrap diff --git a/make/environment.mk b/make/environment.mk index 5c0bb5d6..b10a1b9d 100644 --- a/make/environment.mk +++ b/make/environment.mk @@ -136,7 +136,7 @@ ARCHIVE = $(BASE_DIR)/download BUILD_TMP = $(BASE_DIR)/build_tmp D = $(BASE_DIR)/deps DEPDIR = $(D) -HOSTPREFIX = $(BASE_DIR)/host +HOST_DIR = $(BASE_DIR)/host TARGETPREFIX ?= $(BASE_DIR)/root SOURCE_DIR = $(BASE_DIR)/source MAKE_DIR = $(BASE_DIR)/make @@ -247,9 +247,9 @@ ifneq ($(BOXTYPE), coolstream) USE_LIBSTB-HAL = yes endif -PATH := $(HOSTPREFIX)/bin:$(CROSS_DIR)/bin:$(HELPERS_DIR):$(PATH) +PATH := $(HOST_DIR)/bin:$(CROSS_DIR)/bin:$(HELPERS_DIR):$(PATH) -PKG_CONFIG = $(HOSTPREFIX)/bin/$(TARGET)-pkg-config +PKG_CONFIG = $(HOST_DIR)/bin/$(TARGET)-pkg-config PKG_CONFIG_LIBDIR = $(TARGETLIB) PKG_CONFIG_PATH = $(PKG_CONFIG_LIBDIR)/pkgconfig diff --git a/make/system-libs.mk b/make/system-libs.mk index 187d1449..6e7a4fe7 100644 --- a/make/system-libs.mk +++ b/make/system-libs.mk @@ -129,9 +129,9 @@ $(D)/libcurl: $(D)/zlib $(D)/openssl $(D)/librtmp $(D)/ca-bundle $(ARCHIVE)/curl $(CURL_IPV6) \ --enable-optimize && \ $(MAKE) all && \ - mkdir -p $(HOSTPREFIX)/bin && \ - sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < curl-config > $(HOSTPREFIX)/bin/curl-config && \ - chmod 755 $(HOSTPREFIX)/bin/curl-config && \ + mkdir -p $(HOST_DIR)/bin && \ + sed -e "s,^prefix=,prefix=$(TARGETPREFIX)," < curl-config > $(HOST_DIR)/bin/curl-config && \ + chmod 755 $(HOST_DIR)/bin/curl-config && \ make install DESTDIR=$(TARGETPREFIX) rm -rf $(TARGETPREFIX)/bin/curl-config $(TARGETPREFIX)/share/zsh $(REWRITE_LIBTOOL)/libcurl.la @@ -150,7 +150,7 @@ $(D)/libpng: $(ARCHIVE)/libpng-$(LIBPNG_VER).tar.xz $(D)/zlib | $(TARGETPREFIX) $(PATCH)/libpng-Disable-pngfix-and-png-fix-itxt.patch && \ $(CONFIGURE) \ --prefix=$(TARGETPREFIX) \ - --bindir=$(HOSTPREFIX)/bin \ + --bindir=$(HOST_DIR)/bin \ --mandir=$(BUILD_TMP)/.remove \ --enable-silent-rules \ $(LIBPNG_CONF) \ @@ -182,7 +182,7 @@ $(D)/freetype: $(D)/zlib $(D)/libpng $(ARCHIVE)/freetype-$(FREETYPE_VER).tar.bz2 $(MAKE) all && \ make install && \ ln -sf ./freetype2/freetype $(TARGETINCLUDE)/freetype && \ - mv $(TARGETPREFIX)/bin/freetype-config $(HOSTPREFIX)/bin/freetype-config + mv $(TARGETPREFIX)/bin/freetype-config $(HOST_DIR)/bin/freetype-config $(REMOVE)/freetype-$(FREETYPE_VER) $(TARGETPREFIX)/share/aclocal touch $@ @@ -450,11 +450,11 @@ $(D)/libncurses: $(ARCHIVE)/ncurses-$(LIBNCURSES_VER).tar.gz | $(TARGETPREFIX) --without-cxx-binding && \ $(MAKE) libs && \ $(MAKE) install.libs DESTDIR=$(TARGETPREFIX) - rm -rf $(HOSTPREFIX)/bin/ncurses* + rm -rf $(HOST_DIR)/bin/ncurses* rm -rf $(TARGETLIB)/libform* $(TARGETLIB)/libmenu* $(TARGETLIB)/libpanel* rm -rf $(PKG_CONFIG_PATH)/form.pc $(PKG_CONFIG_PATH)/menu.pc $(PKG_CONFIG_PATH)/panel.pc - mv $(TARGETPREFIX)/bin/ncurses6-config $(HOSTPREFIX)/bin - $(REWRITE_PKGCONF) $(HOSTPREFIX)/bin/ncurses6-config + mv $(TARGETPREFIX)/bin/ncurses6-config $(HOST_DIR)/bin + $(REWRITE_PKGCONF) $(HOST_DIR)/bin/ncurses6-config $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/ncurses.pc ln -sf ./ncurses/curses.h $(TARGETINCLUDE)/curses.h ln -sf ./ncurses/curses.h $(TARGETINCLUDE)/ncurses.h @@ -511,8 +511,8 @@ $(D)/libusb_compat: $(ARCHIVE)/libusb-compat-$(LIBUSB_COMPAT_VER).tar.bz2 $(D)/l $(MAKE) && \ make install DESTDIR=$(TARGETPREFIX) && \ $(REMOVE)/libusb-compat-$(LIBUSB_COMPAT_VER) - mv $(TARGETPREFIX)/bin/libusb-config $(HOSTPREFIX)/bin - $(REWRITE_PKGCONF) $(HOSTPREFIX)/bin/libusb-config + mv $(TARGETPREFIX)/bin/libusb-config $(HOST_DIR)/bin + $(REWRITE_PKGCONF) $(HOST_DIR)/bin/libusb-config $(REWRITE_LIBTOOL)/libusb.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb.pc touch $@ @@ -632,14 +632,14 @@ $(D)/luacurl: $(D)/libcurl $(D)/lua $(ARCHIVE)/Lua-cURL$(LUACURL_VER).tar.xz | $ $(REMOVE)/Lua-cURL$(LUACURL_VER) touch $@ -$(D)/luaposix: $(HOSTPREFIX)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/v$(LUAPOSIX_VER).tar.gz $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz | $(TARGETPREFIX) +$(D)/luaposix: $(HOST_DIR)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE)/v$(LUAPOSIX_VER).tar.gz $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz | $(TARGETPREFIX) $(UNTAR)/v$(LUAPOSIX_VER).tar.gz tar -C $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER)/slingshot --strip=1 -xf $(ARCHIVE)/v$(SLINGSHOT_VER).tar.gz tar -C $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER)/gnulib --strip=1 -xf $(ARCHIVE)/gnulib-$(GNULIB_VER)-stable.tar.gz set -e; cd $(BUILD_TMP)/luaposix-$(LUAPOSIX_VER); \ $(PATCH)/luaposix-fix-build.patch; \ $(PATCH)/luaposix-fix-docdir-build.patch; \ - export LUA=$(HOSTPREFIX)/bin/lua-$(LUA_VER); \ + export LUA=$(HOST_DIR)/bin/lua-$(LUA_VER); \ ./bootstrap; \ autoreconf -fi; \ $(CONFIGURE) \ @@ -656,7 +656,7 @@ $(D)/luaposix: $(HOSTPREFIX)/bin/lua-$(LUA_VER) $(D)/lua $(D)/luaexpat $(ARCHIVE touch $@ # helper for luaposix build -$(HOSTPREFIX)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX) +$(HOST_DIR)/bin/lua-$(LUA_VER): $(ARCHIVE)/lua-$(LUA_VER).tar.gz | $(TARGETPREFIX) $(UNTAR)/lua-$(LUA_VER).tar.gz set -e; cd $(BUILD_TMP)/lua-$(LUA_VER); \ $(PATCH)/lua-01-fix-coolstream-build.patch; \ @@ -753,8 +753,8 @@ $(D)/libgpg-error: $(ARCHIVE)/libgpg-error-$(LIBGPG-ERROR_VER).tar.bz2 | $(TARGE --disable-static && \ $(MAKE) && \ $(MAKE) install DESTDIR=$(TARGETPREFIX) - mv $(TARGETPREFIX)/bin/gpg-error-config $(HOSTPREFIX)/bin - $(REWRITE_PKGCONF) $(HOSTPREFIX)/bin/gpg-error-config + mv $(TARGETPREFIX)/bin/gpg-error-config $(HOST_DIR)/bin + $(REWRITE_PKGCONF) $(HOST_DIR)/bin/gpg-error-config $(REWRITE_LIBTOOL)/libgpg-error.la rm -rf $(TARGETPREFIX)/bin/gpg-error rm -rf $(TARGETPREFIX)/share/common-lisp @@ -775,8 +775,8 @@ $(D)/libgcrypt: $(ARCHIVE)/libgcrypt-$(LIBGCRYPT_VER).tar.gz $(D)/libgpg-error | --disable-static && \ $(MAKE) && \ $(MAKE) install DESTDIR=$(TARGETPREFIX) - mv $(TARGETPREFIX)/bin/libgcrypt-config $(HOSTPREFIX)/bin - $(REWRITE_PKGCONF) $(HOSTPREFIX)/bin/libgcrypt-config + mv $(TARGETPREFIX)/bin/libgcrypt-config $(HOST_DIR)/bin + $(REWRITE_PKGCONF) $(HOST_DIR)/bin/libgcrypt-config $(REWRITE_LIBTOOL)/libgcrypt.la rm -rf $(TARGETPREFIX)/bin/dumpsexp rm -rf $(TARGETPREFIX)/bin/hmac256 @@ -843,10 +843,10 @@ $(D)/libxml2: $(ARCHIVE)/libxml2-$(LIBXML2_VER).tar.gz | $(TARGETPREFIX) --without-schematron && \ $(MAKE) && \ $(MAKE) install DESTDIR=$(TARGETPREFIX) - mv $(TARGETPREFIX)/bin/xml2-config $(HOSTPREFIX)/bin + mv $(TARGETPREFIX)/bin/xml2-config $(HOST_DIR)/bin $(REWRITE_LIBTOOL)/libxml2.la $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libxml-2.0.pc - $(REWRITE_PKGCONF) $(HOSTPREFIX)/bin/xml2-config + $(REWRITE_PKGCONF) $(HOST_DIR)/bin/xml2-config rm -rf $(TARGETLIB)/xml2Conf.sh rm -rf $(TARGETLIB)/cmake $(REMOVE)/libxml2-$(LIBXML2_VER)