cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG)

Browse Source 
As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely
on it. See 73b7f55424 for more information on
STAGING_DIR_HOSTPKG.

STAGING_DIR_HOSTPKG won't actually be changed before the first LEDE release
(it is equivalent to $(STAGING_DIR)/host), so this simple search/replace
cleanup is safe to apply. Doing this cleanup now will be useful for the
Gluon project (an OpenWrt/LEDE based firmware framework) for experimenting
with modifying STAGING_DIR_HOSTPKG before doing this in the LEDE upstream.

Also fixes a typo in the dbus Makefile ("STAGIND_DIR").

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer
2017-01-10 15:02:50 +01:00
parent 876d139c98
commit 4a984a8d60
36 changed files with 61 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/boost/Makefile
+2 -2
View File
@@ -417,11 +417,11 @@ endef
define Host/Install
$(INSTALL_DIR) \
$(STAGING_DIR)/host/bin
$(STAGING_DIR_HOSTPKG)/bin
$(CP) \
$(HOST_BUILD_DIR)/tools/build/src/engine/bin.*/b2 \
$(STAGING_DIR)/host/bin/
$(STAGING_DIR_HOSTPKG)/bin/
endef
define Package/boost/Default/install
libs/glib2/Makefile
+1 -1
View File
@@ -61,7 +61,7 @@ CONFIGURE_ARGS += \
CONFIGURE_VARS += \
glib_cv_stack_grows=no \
glib_cv_uscore=no \
ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR)/host/bin/glib-genmarshal \
ac_cv_path_GLIB_GENMARSHAL=$(STAGING_DIR_HOSTPKG)/bin/glib-genmarshal \
ac_cv_func_mmap_fixed_mapped=yes \
ac_cv_func_posix_getpwuid_r=yes \
ac_cv_func_posix_getgrgid_r=yes
libs/libgd/Makefile
+1 -1
View File
@@ -54,7 +54,7 @@ CONFIGURE_ARGS += \
--without-iconv
CONFIGURE_VARS += \
LIBPNG12_CONFIG="$(STAGING_DIR)/host/bin/libpng12-config" \
LIBPNG12_CONFIG="$(STAGING_DIR_HOSTPKG)/bin/libpng12-config" \
ac_cv_header_iconv_h=no
define Build/InstallDev
libs/libgee/Makefile
+2 -2
View File
@@ -57,10 +57,10 @@ define Build/InstallDev
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
$(1)/usr/lib/pkgconfig/
$(INSTALL_DIR) $(STAGING_DIR)/host/share/vala-0.30/vapi/
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/share/vala-0.30/vapi/
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/share/vala/vapi/* \
$(STAGING_DIR)/host/share/vala-0.30/vapi
$(STAGING_DIR_HOSTPKG)/share/vala-0.30/vapi
endef
define Package/libgee/install
libs/libgpg-error/Makefile
+1 -1
View File
@@ -51,7 +51,7 @@ define Build/InstallDev
$(SED) \
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
$(2)/bin/gpg-error-config
ln -sf $(STAGING_DIR)/host/bin/gpg-error-config $(1)/usr/bin/gpg-error-config
ln -sf $(STAGING_DIR_HOSTPKG)/bin/gpg-error-config $(1)/usr/bin/gpg-error-config
$(INSTALL_DIR) $(1)/usr/include
$(INSTALL_DATA) \
libs/libmraa/Makefile
+2 -2
View File
@@ -28,8 +28,8 @@ include $(INCLUDE_DIR)/cmake.mk
CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \
-DENABLEEXAMPLES=0 \
-DNODE_EXECUTABLE=$(STAGING_DIR)/host/bin/node \
-DSWIG_DIR=$(STAGING_DIR)/host/bin
-DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node \
-DSWIG_DIR=$(STAGING_DIR_HOSTPKG)/bin
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/node
libs/libupm/Makefile
+2 -2
View File
@@ -36,8 +36,8 @@ UPM_MODULES:= \
th02 tm1637 tsl2561 ttp223 ublox6 uln200xa waterlevel wheelencoder wt5001 yg1006 zfm20
CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \
-DNODE_EXECUTABLE=$(STAGING_DIR)/host/bin/node \
-DSWIG_DIR=$(STAGING_DIR)/host/bin
-DNODE_EXECUTABLE=$(STAGING_DIR_HOSTPKG)/bin/node \
-DSWIG_DIR=$(STAGING_DIR_HOSTPKG)/bin
define Package/libupm/Default
SECTION:=libs
libs/libxslt/Makefile
+1 -1
View File
@@ -83,7 +83,7 @@ define Build/InstallDev/Xslt
$(PKG_INSTALL_DIR)/usr/bin/xslt-config \
$(2)/bin/
ln -sf $(STAGING_DIR)/host/bin/xslt-config $(1)/usr/bin/xslt-config
ln -sf $(STAGING_DIR_HOSTPKG)/bin/xslt-config $(1)/usr/bin/xslt-config
$(SED) \
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
libs/libzdb/Makefile
+2 -2
View File
@@ -63,8 +63,8 @@ define Host/Compile
endef
define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/host/bin
$(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR)/host/bin/
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin
$(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR_HOSTPKG)/bin/
endef
$(eval $(call HostBuild))
libs/libzdb/patches/020-filterh-use-host-built-version.patch
+1 -1
View File
@@ -14,7 +14,7 @@ diff -rupN libzdb-3.0.orig/Makefile.am libzdb-3.0/Makefile.am
RE2C = @RE2C@
RE2CFLAGS = -b
-FILTERH = ./tools/bin/filterh
+FILTERH = $(STAGING_DIR)/host/bin/filterh
+FILTERH = $(STAGING_DIR_HOSTPKG)/bin/filterh
AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS)
AM_CPPFLAGS += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/exceptions
libs/postgresql/Makefile
+4 -4
View File
@@ -147,14 +147,14 @@ endef
define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/usr/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/bin/pg_config/pg_config $(STAGING_DIR)/usr/bin/
$(INSTALL_DIR) $(STAGING_DIR)/host/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg $(STAGING_DIR)/host/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/timezone/zic $(STAGING_DIR)/host/bin/
$(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/interfaces/ecpg/preproc/ecpg $(STAGING_DIR_HOSTPKG)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/timezone/zic $(STAGING_DIR_HOSTPKG)/bin/
endef
define Build/Configure
$(Build/Configure/Default)
$(SED) 's@ECPG = ../../preproc/ecpg@ECPG = $(STAGING_DIR)/host/bin/ecpg@' $(PKG_BUILD_DIR)/src/interfaces/ecpg/test/Makefile.regress
$(SED) 's@ECPG = ../../preproc/ecpg@ECPG = $(STAGING_DIR_HOSTPKG)/bin/ecpg@' $(PKG_BUILD_DIR)/src/interfaces/ecpg/test/Makefile.regress
endef
TARGET_CFLAGS += $(FPIC) -lpthread
libs/protobuf/Makefile
+1 -1
View File
@@ -41,7 +41,7 @@ define Package/protobuf/description
of its internal RPC protocols and file formats.
endef
CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR)/host/bin/protoc
CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOSTPKG)/bin/protoc
define Build/InstallDev
$(INSTALL_DIR) \