domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package: replace $(STAGING_DIR)/host with $(STAGING_DIR_HOSTPKG)

Browse Source 
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>
This commit is contained in:
Matthias Schiffer
2017-01-10 18:43:57 +01:00
parent 7480d3309c
commit 77beaf2ec9
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/libs/gettext-full/Makefile
View File

@@ -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

8
package/libs/gettext/Makefile
View File

@@ -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

12
package/libs/libiconv/Makefile
View File

@@ -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))

2
package/libs/libtool/Makefile
View File

@@ -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

2
package/libs/ncurses/Makefile
View File

@@ -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