KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
8 changed files with 22 additions and 22 deletions
Show stats 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) TARGET_CFLAGS += $(FPIC)
ifneq ($(HOST_OS),Linux) ifneq ($(HOST_OS),Linux)
TARGET_CFLAGS += -I$(STAGING_DIR)/host/include TARGET_CFLAGS += -I$(STAGING_DIR_HOSTPKG)/include
endif endif
ifdef CONFIG_USE_MUSL ifdef CONFIG_USE_MUSL
TARGET_CFLAGS += -D__UCLIBC__ TARGET_CFLAGS += -D__UCLIBC__
@ -83,7 +83,7 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/share/aclocal $(INSTALL_DIR) $(1)/usr/share/aclocal
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(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 endef
define Package/libintl-full/install define Package/libintl-full/install

8
package/libs/gettext/Makefile
View file

@ -47,11 +47,11 @@ define Host/Compile
endef endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/host/include $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/include
$(INSTALL_DATA) ./src/include/libintl.h $(STAGING_DIR)/host/include/ $(INSTALL_DATA) ./src/include/libintl.h $(STAGING_DIR_HOSTPKG)/include/
$(INSTALL_DIR) $(STAGING_DIR)/host/share/aclocal $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/aclocal
$(INSTALL_DATA) ./src/m4/* $(STAGING_DIR)/host/share/aclocal/ $(INSTALL_DATA) ./src/m4/* $(STAGING_DIR_HOSTPKG)/share/aclocal/
endef endef
define Package/libintl/install define Package/libintl/install

12
package/libs/libiconv/Makefile
View file

@ -65,14 +65,14 @@ define Host/Compile
endef endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/host/lib $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/lib
$(INSTALL_DATA) $(HOST_BUILD_DIR)/libiconv.a $(STAGING_DIR)/host/lib/ $(INSTALL_DATA) $(HOST_BUILD_DIR)/libiconv.a $(STAGING_DIR_HOSTPKG)/lib/
$(INSTALL_DIR) $(STAGING_DIR)/host/include $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/include
$(INSTALL_DATA) ./src/include/iconv.h $(STAGING_DIR)/host/include/ $(INSTALL_DATA) ./src/include/iconv.h $(STAGING_DIR_HOSTPKG)/include/
$(INSTALL_DIR) $(STAGING_DIR)/host/share/aclocal $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/aclocal
$(INSTALL_DATA) ./src/m4/* $(STAGING_DIR)/host/share/aclocal/ $(INSTALL_DATA) ./src/m4/* $(STAGING_DIR_HOSTPKG)/share/aclocal/
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

2
package/libs/libtool/Makefile
View file

@ -22,7 +22,7 @@ PKG_BUILD_PARALLEL:=0
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
CONFIGURE_PREFIX=$(STAGING_DIR)/host CONFIGURE_PREFIX=$(STAGING_DIR_HOSTPKG)
export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
define Package/libltdl 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/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ncursesw6-config $(2)/bin/
$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \ $(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' -e 's/$$$$INCS //g' \
$(2)/bin/ncursesw6-config $(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 endef
define Host/Compile define Host/Compile

6
package/utils/bsdiff/Makefile
View file

@ -59,8 +59,8 @@ define Package/bspatch/install
endef endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/host/bin/ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
$(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR)/host/ install $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOSTPKG)/ install
endef endef
define Host/Compile define Host/Compile
@ -70,7 +70,7 @@ define Host/Compile
endef endef
define Host/Install define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/bsdiff $(STAGING_DIR)/host/bin/ $(INSTALL_BIN) $(HOST_BUILD_DIR)/bsdiff $(STAGING_DIR_HOSTPKG)/bin/
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

6
package/utils/bzip2/Makefile
View file

@ -93,11 +93,11 @@ HOST_MAKE_FLAGS+= \
all all
HOST_CONFIGURE_ARGS+= \ HOST_CONFIGURE_ARGS+= \
--prefix=$(STAGING_DIR)/host --prefix=$(STAGING_DIR_HOSTPKG)
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/host/bin/ $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
$(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR)/host/ install $(MAKE) -C $(HOST_BUILD_DIR) PREFIX=$(STAGING_DIR_HOSTPKG)/ install
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))

4
package/utils/lua/Makefile
View file

@ -111,7 +111,7 @@ define Build/Compile
endef endef
define Host/Configure 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 endef
ifeq ($(HOST_OS),Darwin) ifeq ($(HOST_OS),Darwin)
@ -132,7 +132,7 @@ endef
define Host/Install define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) \ $(MAKE) -C $(HOST_BUILD_DIR) \
INSTALL_TOP="$(STAGING_DIR)/host" \ INSTALL_TOP="$(STAGING_DIR_HOSTPKG)" \
install install
endef endef