summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2017-01-10 18:43:57 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2017-01-10 22:15:37 +0100
commit77beaf2ec91bba0a0202ea63877ed3b399effabf (patch)
treecf7f16585546f96a575a1e4630ddd963dcc1f623
parent7480d3309cbe40378da48c3b6decc4ba2b1fc3d5 (diff)
downloadmtk-20170518-77beaf2ec91bba0a0202ea63877ed3b399effabf.zip
mtk-20170518-77beaf2ec91bba0a0202ea63877ed3b399effabf.tar.gz
mtk-20170518-77beaf2ec91bba0a0202ea63877ed3b399effabf.tar.bz2
package: replace $(STAGING_DIR)/host with $(STAGING_DIR_HOSTPKG)
Cleanup to prepare for changing STAGING_DIR_HOSTPKG. The actual change of STAGING_DIR_HOSTPKG (i.e., moving the host packages back into a common, not target-specific directory) will be done after the first LEDE release, but the cleanup will also be useful for projects like Gluon. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-rw-r--r--package/libs/gettext-full/Makefile4
-rw-r--r--package/libs/gettext/Makefile8
-rw-r--r--package/libs/libiconv/Makefile12
-rw-r--r--package/libs/libtool/Makefile2
-rw-r--r--package/libs/ncurses/Makefile2
-rw-r--r--package/utils/bsdiff/Makefile6
-rw-r--r--package/utils/bzip2/Makefile6
-rw-r--r--package/utils/lua/Makefile4
8 files changed, 22 insertions, 22 deletions
diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
index 64d2760..d293e30 100644
--- a/package/libs/gettext-full/Makefile
+++ b/package/libs/gettext-full/Makefile
@@ -37,7 +37,7 @@ endef
TARGET_CFLAGS += $(FPIC)
ifneq ($(HOST_OS),Linux)
- TARGET_CFLAGS += -I$(STAGING_DIR)/host/include
+ TARGET_CFLAGS += -I$(STAGING_DIR_HOSTPKG)/include
endif
ifdef CONFIG_USE_MUSL
TARGET_CFLAGS += -D__UCLIBC__
@@ -83,7 +83,7 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/share/aclocal
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
- $(SED) '/read dummy/d' $(STAGING_DIR)/host/bin/gettextize
+ $(SED) '/read dummy/d' $(STAGING_DIR_HOSTPKG)/bin/gettextize
endef
define Package/libintl-full/install
diff --git a/package/libs/gettext/Makefile b/package/libs/gettext/Makefile
index b023330..f37c4e4 100644
--- a/package/libs/gettext/Makefile
+++ b/package/libs/gettext/Makefile
@@ -47,11 +47,11 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR)/host/include
- $(INSTALL_DATA) ./src/include/libintl.h $(STAGING_DIR)/host/include/
+ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/include
+ $(INSTALL_DATA) ./src/include/libintl.h $(STAGING_DIR_HOSTPKG)/include/
- $(INSTALL_DIR) $(STAGING_DIR)/host/share/aclocal
- $(INSTALL_DATA) ./src/m4/* $(STAGING_DIR)/host/share/aclocal/
+ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/aclocal
+ $(INSTALL_DATA) ./src/m4/* $(STAGING_DIR_HOSTPKG)/share/aclocal/
endef
define Package/libintl/install
diff --git a/package/libs/libiconv/Makefile b/package/libs/libiconv/Makefile
index 0cb7cc7..4d7dcd3 100644
--- a/package/libs/libiconv/Makefile
+++ b/package/libs/libiconv/Makefile
@@ -65,14 +65,14 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR)/host/lib
- $(INSTALL_DATA) $(HOST_BUILD_DIR)/libiconv.a $(STAGING_DIR)/host/lib/
+ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib
+ $(INSTALL_DATA) $(HOST_BUILD_DIR)/libiconv.a $(STAGING_DIR_HOSTPKG)/lib/
- $(INSTALL_DIR) $(STAGING_DIR)/host/include
- $(INSTALL_DATA) ./src/include/iconv.h $(STAGING_DIR)/host/include/
+ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/include
+ $(INSTALL_DATA) ./src/include/iconv.h $(STAGING_DIR_HOSTPKG)/include/
- $(INSTALL_DIR) $(STAGING_DIR)/host/share/aclocal
- $(INSTALL_DATA) ./src/m4/* $(STAGING_DIR)/host/share/aclocal/
+ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/aclocal
+ $(INSTALL_DATA) ./src/m4/* $(STAGING_DIR_HOSTPKG)/share/aclocal/
endef
$(eval $(call HostBuild))
diff --git a/package/libs/libtool/Makefile b/package/libs/libtool/Makefile
index 39e7b0d..2d5cedf 100644
--- a/package/libs/libtool/Makefile
+++ b/package/libs/libtool/Makefile
@@ -22,7 +22,7 @@ PKG_BUILD_PARALLEL:=0
include $(INCLUDE_DIR)/package.mk
-CONFIGURE_PREFIX=$(STAGING_DIR)/host
+CONFIGURE_PREFIX=$(STAGING_DIR_HOSTPKG)
export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
define Package/libltdl
diff --git a/package/libs/ncurses/Makefile b/package/libs/ncurses/Makefile
index 60a8a17..88a31e2 100644
--- a/package/libs/ncurses/Makefile
+++ b/package/libs/ncurses/Makefile
@@ -135,7 +135,7 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw6-config $(2)/bin/
$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \
$(2)/bin/ncursesw6-config
- ln -sf $(STAGING_DIR)/host/bin/ncursesw6-config $(1)/usr/bin/ncursesw6-config
+ ln -sf $(STAGING_DIR_HOSTPKG)/bin/ncursesw6-config $(1)/usr/bin/ncursesw6-config
endef
define Host/Compile
diff --git a/package/utils/bsdiff/Makefile b/package/utils/bsdiff/Makefile
index 067eba0..8589e77 100644
--- a/package/utils/bsdiff/Makefile
+++ b/package/utils/bsdiff/Makefile
@@ -59,8 +59,8 @@ define Package/bspatch/install
endef
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR)/host/bin/
- $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR)/host/ install
+ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
+ $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOSTPKG)/ install
endef
define Host/Compile
@@ -70,7 +70,7 @@ define Host/Compile
endef
define Host/Install
- $(INSTALL_BIN) $(HOST_BUILD_DIR)/bsdiff $(STAGING_DIR)/host/bin/
+ $(INSTALL_BIN) $(HOST_BUILD_DIR)/bsdiff $(STAGING_DIR_HOSTPKG)/bin/
endef
$(eval $(call HostBuild))
diff --git a/package/utils/bzip2/Makefile b/package/utils/bzip2/Makefile
index 3f2de45..c17dee1 100644
--- a/package/utils/bzip2/Makefile
+++ b/package/utils/bzip2/Makefile
@@ -93,11 +93,11 @@ HOST_MAKE_FLAGS+= \
all
HOST_CONFIGURE_ARGS+= \
- --prefix=$(STAGING_DIR)/host
+ --prefix=$(STAGING_DIR_HOSTPKG)
define Host/Install
- $(INSTALL_DIR) $(STAGING_DIR)/host/bin/
- $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR)/host/ install
+ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
+ $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOSTPKG)/ install
endef
$(eval $(call HostBuild))
diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
index 29de1cc..89b6a87 100644
--- a/package/utils/lua/Makefile
+++ b/package/utils/lua/Makefile
@@ -111,7 +111,7 @@ define Build/Compile
endef
define Host/Configure
- $(SED) 's,"/usr/local/","$(STAGING_DIR)/host/",' $(HOST_BUILD_DIR)/src/luaconf.h
+ $(SED) 's,"/usr/local/","$(STAGING_DIR_HOSTPKG)/",' $(HOST_BUILD_DIR)/src/luaconf.h
endef
ifeq ($(HOST_OS),Darwin)
@@ -132,7 +132,7 @@ endef
define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) \
- INSTALL_TOP="$(STAGING_DIR)/host" \
+ INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \
install
endef