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

treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau
2016-01-20 20:30:04 +01:00
parent f12aae60ad
commit 9f8e5aca34
34 changed files with 75 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/boost/Makefile
+2 -2
View File
@@ -397,11 +397,11 @@ endef
define Host/Install
$(INSTALL_DIR) \
$(STAGING_DIR_HOST)/bin
$(STAGING_DIR)/host/bin
$(CP) \
$(HOST_BUILD_DIR)/tools/build/src/engine/bin.*/b2 \
$(STAGING_DIR_HOST)/bin/
$(STAGING_DIR)/host/bin/
endef
define Package/boost/Default/install
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)/host/share/vala-0.30/vapi/
$(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/share/vala/vapi/* \
$(STAGING_DIR_HOST)/share/vala-0.30/vapi
$(STAGING_DIR)/host/share/vala-0.30/vapi
endef
define Package/libgee/install
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)/host/bin/node \
-DSWIG_DIR=$(STAGING_DIR)/host/bin
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/node
libs/libsearpc/Makefile
+2 -2
View File
@@ -52,8 +52,8 @@ define Host/Compile
endef
define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin
$(INSTALL_BIN) $(HOST_BUILD_DIR)/lib/searpc-codegen.py $(STAGING_DIR_HOST)/bin/
$(INSTALL_DIR) $(STAGING_DIR)/host/bin
$(INSTALL_BIN) $(HOST_BUILD_DIR)/lib/searpc-codegen.py $(STAGING_DIR)/host/bin/
endef
$(eval $(call HostBuild))
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)/host/bin/node \
-DSWIG_DIR=$(STAGING_DIR)/host/bin
define Package/libupm/Default
SECTION:=libs
libs/libzdb/Makefile
+2 -2
View File
@@ -67,8 +67,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)/host/bin
$(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR)/host/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)/host/bin/filterh
AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS)
AM_CPPFLAGS += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/exceptions
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)/host/bin/protoc
define Build/InstallDev
$(INSTALL_DIR) \