aboutsummaryrefslogtreecommitdiffstats
path: root/package/libs
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 /package/libs
parent7480d3309cbe40378da48c3b6decc4ba2b1fc3d5 (diff)
downloadupstream-77beaf2ec91bba0a0202ea63877ed3b399effabf.tar.gz
upstream-77beaf2ec91bba0a0202ea63877ed3b399effabf.tar.bz2
upstream-77beaf2ec91bba0a0202ea63877ed3b399effabf.zip
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>
Diffstat (limited to 'package/libs')
-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
5 files changed, 14 insertions, 14 deletions
diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
index 64d27609c3..d293e30eac 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 b0233309e2..f37c4e4e74 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 0cb7cc7254..4d7dcd3498 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 39e7b0d7a3..2d5cedf786 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 60a8a176df..88a31e299b 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