From 876d139c98a822f04aed2767b08638cd6efd0a45 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 10 Jan 2017 02:24:29 +0100 Subject: [PATCH 1/2] python{,3}: remove STAGING_DIR_HOSTPKG fallback definition STAGING_DIR_HOSTPKG is now defined in both OpenWrt and LEDE, so we can start to rely on it. Signed-off-by: Matthias Schiffer --- lang/python/files/python-host.mk | 6 ------ lang/python3/files/python3-host.mk | 6 ------ 2 files changed, 12 deletions(-) diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index 7833a0c736..ff2ed57d98 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -11,12 +11,6 @@ __python_host_mk_inc=1 # For PYTHON_VERSION $(call include_mk, python-version.mk) -# Compatibility fallback for older OpenWrt and LEDE versions -ifeq ($(STAGING_DIR_HOSTPKG),) - $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host) - STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host -endif - HOST_PYTHON_DIR:=$(STAGING_DIR_HOSTPKG) HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION) HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION) diff --git a/lang/python3/files/python3-host.mk b/lang/python3/files/python3-host.mk index 278b90d90c..e9677734fb 100644 --- a/lang/python3/files/python3-host.mk +++ b/lang/python3/files/python3-host.mk @@ -11,12 +11,6 @@ __python3_host_mk_inc=1 # For PYTHON3_VERSION $(call include_mk, python3-version.mk) -# Compatibility fallback for older OpenWrt and LEDE versions -ifeq ($(STAGING_DIR_HOSTPKG),) - $(warning STAGING_DIR_HOSTPKG is unset - falling back to $$(STAGING_DIR)/host) - STAGING_DIR_HOSTPKG := $(STAGING_DIR)/host -endif - HOST_PYTHON3_DIR:=$(STAGING_DIR_HOSTPKG) HOST_PYTHON3_INC_DIR:=$(HOST_PYTHON3_DIR)/include/python$(PYTHON3_VERSION) HOST_PYTHON3_LIB_DIR:=$(HOST_PYTHON3_DIR)/lib/python$(PYTHON3_VERSION) From 4a984a8d60f167db87dac6a6c283e62aca692d5e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 10 Jan 2017 15:02:50 +0100 Subject: [PATCH 2/2] treewide: replace $(STAGING_DIR)/host and $(HOST_BUILD_PREFIX) with $(STAGING_DIR_HOSTPKG) As both LEDE and OpenWrt have STAGING_DIR_HOSTPKG now, we can start to rely on it. See 73b7f55424de52d8179a9ad808252fe3bf8dcc9d 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 --- admin/sudo/Makefile | 4 ++-- lang/luajit/Makefile | 6 +++--- lang/lualanes/Makefile | 4 ++-- lang/luarocks/Makefile | 2 +- lang/node/Makefile | 2 +- lang/perl-xml-parser/Makefile | 4 ++-- lang/perl/Makefile | 2 +- lang/perl/perlmod.mk | 6 +++--- lang/php7/Makefile | 2 +- lang/python-cffi/Makefile | 2 +- lang/python-packages/Makefile | 4 ++-- lang/python-pip/Makefile | 2 +- lang/python-ply/Makefile | 2 +- lang/python-pycparser/Makefile | 2 +- lang/python-setuptools/Makefile | 2 +- lang/python/files/python-host.mk | 2 +- lang/python3/files/python3-host.mk | 2 +- lang/ruby/Makefile | 2 +- libs/boost/Makefile | 4 ++-- libs/glib2/Makefile | 2 +- libs/libgd/Makefile | 2 +- libs/libgee/Makefile | 4 ++-- libs/libgpg-error/Makefile | 2 +- libs/libmraa/Makefile | 4 ++-- libs/libupm/Makefile | 4 ++-- libs/libxslt/Makefile | 2 +- libs/libzdb/Makefile | 4 ++-- .../patches/020-filterh-use-host-built-version.patch | 2 +- libs/postgresql/Makefile | 8 ++++---- libs/protobuf/Makefile | 2 +- multimedia/grilo/Makefile | 4 ++-- net/nfs-kernel-server/Makefile | 8 ++++---- net/prosody/Makefile | 2 +- net/seafile-ccnet/patches/010-Makefile.patch | 4 ++-- .../patches/050-libseafile-makefile-fixes.patch | 4 ++-- utils/dbus/Makefile | 8 ++++---- 36 files changed, 61 insertions(+), 61 deletions(-) diff --git a/admin/sudo/Makefile b/admin/sudo/Makefile index 05551613e7..e9090eea40 100644 --- a/admin/sudo/Makefile +++ b/admin/sudo/Makefile @@ -64,8 +64,8 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(HOST_BUILD_PREFIX)/bin - $(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(HOST_BUILD_PREFIX)/bin/ + $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin + $(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR_HOSTPKG)/bin/ endef $(eval $(call HostBuild)) diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile index c68f10ac2d..3606d24162 100644 --- a/lang/luajit/Makefile +++ b/lang/luajit/Makefile @@ -75,16 +75,16 @@ endef define Host/Compile $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ - DPREFIX=$(STAGING_DIR)/host \ + DPREFIX=$(STAGING_DIR_HOSTPKG) \ TARGET_CFLAGS="$(HOST_CFLAGS)" \ TARGET_LDFLAGS="$(HOST_LDFLAGS)" endef define Host/Install $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ - DPREFIX=$(STAGING_DIR)/host \ + DPREFIX=$(STAGING_DIR_HOSTPKG) \ install - $(CP) $(STAGING_DIR)/host/bin/luajit-2.1.0-beta2 $(STAGING_DIR)/host/bin/$(PKG_NAME) + $(CP) $(STAGING_DIR_HOSTPKG)/bin/luajit-2.1.0-beta2 $(STAGING_DIR_HOSTPKG)/bin/$(PKG_NAME) endef $(eval $(call HostBuild,luajit)) diff --git a/lang/lualanes/Makefile b/lang/lualanes/Makefile index 616129066f..749709d99a 100644 --- a/lang/lualanes/Makefile +++ b/lang/lualanes/Makefile @@ -42,8 +42,8 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) all \ CC="$(TARGET_CC)" \ - LUA="$(STAGING_DIR)/host/bin/lua" \ - LUAC="$(STAGING_DIR)/host/bin/luac" \ + LUA="$(STAGING_DIR_HOSTPKG)/bin/lua" \ + LUAC="$(STAGING_DIR_HOSTPKG)/bin/luac" \ OPT_FLAGS="$(TARGET_CFLAGS) --std=c99 -Dpthread_yield=sched_yield" endef diff --git a/lang/luarocks/Makefile b/lang/luarocks/Makefile index b8b89ae99e..73dbde722b 100644 --- a/lang/luarocks/Makefile +++ b/lang/luarocks/Makefile @@ -41,7 +41,7 @@ endef CONFIGURE_ARGS = \ --prefix=$(CONFIGURE_PREFIX) \ --sysconfdir=/etc \ - --with-lua=$(STAGING_DIR)/host + --with-lua=$(STAGING_DIR_HOSTPKG) CONFIGURE_VARS = \ LUAROCKS_UNAME_S="Linux" \ diff --git a/lang/node/Makefile b/lang/node/Makefile index 6cb1e205df..3a1a2f3eb8 100644 --- a/lang/node/Makefile +++ b/lang/node/Makefile @@ -72,7 +72,7 @@ HOST_CONFIGURE_VARS:= HOST_CONFIGURE_ARGS:= \ --dest-os=linux \ --without-snapshot \ - --prefix=$(HOST_BUILD_PREFIX) + --prefix=$(STAGING_DIR_HOSTPKG) HOST_CONFIGURE_CMD:=python ./configure diff --git a/lang/perl-xml-parser/Makefile b/lang/perl-xml-parser/Makefile index e5d3b2c88b..57977c19b8 100644 --- a/lang/perl-xml-parser/Makefile +++ b/lang/perl-xml-parser/Makefile @@ -25,8 +25,8 @@ HOST_BUILD_DEPENDS:=perl/host expat/host EXPAT_LIBPATH:=$(STAGING_DIR)/usr/lib EXPAT_INCPATH=$(STAGING_DIR)/usr/include -HOST_EXPAT_LIBPATH:=$(STAGING_DIR)/host/lib -HOST_EXPAT_INCPATH=$(STAGING_DIR)/host/include +HOST_EXPAT_LIBPATH:=$(STAGING_DIR_HOSTPKG)/lib +HOST_EXPAT_INCPATH=$(STAGING_DIR_HOSTPKG)/include include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 7c7f10d4e0..21f0349d6c 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -35,7 +35,7 @@ PKG_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1 # Variables used during configuration/build -HOST_PERL_PREFIX:=$(STAGING_DIR)/host/usr +HOST_PERL_PREFIX:=$(STAGING_DIR_HOSTPKG)/usr # Filter -g3, it will break Compress-Raw-Zlib TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS)) diff --git a/lang/perl/perlmod.mk b/lang/perl/perlmod.mk index c64942fede..173e890a8b 100644 --- a/lang/perl/perlmod.mk +++ b/lang/perl/perlmod.mk @@ -4,12 +4,12 @@ PERL_VERSION:=5.22 # Build environment -HOST_PERL_PREFIX:=$(STAGING_DIR)/host/usr +HOST_PERL_PREFIX:=$(STAGING_DIR_HOSTPKG)/usr ifneq ($(CONFIG_USE_GLIBC),) EXTRA_LIBS:=bsd EXTRA_LIBDIRS:=$(STAGING_DIR)/lib endif -PERL_CMD:=$(STAGING_DIR)/host/usr/bin/perl$(PERL_VERSION).0 +PERL_CMD:=$(STAGING_DIR_HOSTPKG)/usr/bin/perl$(PERL_VERSION).0 MOD_CFLAGS_PERL:=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) ifdef CONFIG_PERL_THREADS @@ -26,7 +26,7 @@ define perlmod/host/relink rm -f $(1)/Makefile.aperl $(MAKE) -C $(1) perl $(CP) $(1)/perl $(PERL_CMD) - $(CP) $(1)/perl $(STAGING_DIR)/host/usr/bin/perl + $(CP) $(1)/perl $(STAGING_DIR_HOSTPKG)/usr/bin/perl endef define perlmod/host/Configure diff --git a/lang/php7/Makefile b/lang/php7/Makefile index d311a7b068..3f3c2cb564 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -443,7 +443,7 @@ CONFIGURE_VARS+= \ ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \ php_cv_cc_rpath="no" \ iconv_impl_name="gnu_libiconv" \ - ac_cv_php_xml2_config_path="$(STAGING_DIR)/host/bin/xml2-config" \ + ac_cv_php_xml2_config_path="$(STAGING_DIR_HOSTPKG)/bin/xml2-config" \ define Package/php7/conffiles /etc/php.ini diff --git a/lang/python-cffi/Makefile b/lang/python-cffi/Makefile index b8a50009d2..b6d15fd6a9 100644 --- a/lang/python-cffi/Makefile +++ b/lang/python-cffi/Makefile @@ -45,7 +45,7 @@ define Build/Compile endef define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)") endef define Host/Install diff --git a/lang/python-packages/Makefile b/lang/python-packages/Makefile index f12b78e4d2..701f0e6c42 100644 --- a/lang/python-packages/Makefile +++ b/lang/python-packages/Makefile @@ -69,7 +69,7 @@ CONFIG_PACKAGE_python-packages-envs:=$(call qstrip,$(CONFIG_PACKAGE_python-packa CONFIG_PACKAGE_python-packages-extra-deps:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-extra-deps)) CONFIG_PACKAGE_python-packages-pip-opts:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-pip-opts)) -HOST_PYTHON_PIP:=$(STAGING_DIR)/host/bin/pip$(PYTHON_VERSION) +HOST_PYTHON_PIP:=$(STAGING_DIR_HOSTPKG)/bin/pip$(PYTHON_VERSION) decr=$(word $(1),0 1 2 3 4 5 6 7 8 9 10) recur=$(if $(subst 0,,$(2)),$(call recur,$(1),$(call decr,$(2)),$(call $(1)$(2),$(3))),$(3)) @@ -92,7 +92,7 @@ HOST_PYTHON_PIP_INSTALL=$(HOST_PYTHON_PIP) install \ $(if $(CONFIG_PACKAGE_python-packages-index-url), --index-url $(CONFIG_PACKAGE_python-packages-index-url)) \ $(if $(CONFIG_PACKAGE_python-packages-pip-opts), $(CONFIG_PACKAGE_python-packages-pip-opts)) \ -HOST_PYTHON_PIP_INSTALL_HOST:=$(call HOST_PYTHON_PIP_INSTALL,$(STAGING_DIR)/host,"") +HOST_PYTHON_PIP_INSTALL_HOST:=$(call HOST_PYTHON_PIP_INSTALL,$(STAGING_DIR_HOSTPKG),"") HOST_PYTHON_PIP_INSTALL_TARGET=$(call HOST_PYTHON_PIP_INSTALL,$(PKG_INSTALL_DIR)/$(call req2dir,$(pkg)),/usr) HOST_PYTHON_PIP_INSTALL_CLEANUP:=$(call HOST_PYTHON_PIP_INSTALL,$(PKG_INSTALL_DIR)/_cleanup,/usr) diff --git a/lang/python-pip/Makefile b/lang/python-pip/Makefile index db40f8f6a3..2099e63a95 100644 --- a/lang/python-pip/Makefile +++ b/lang/python-pip/Makefile @@ -62,7 +62,7 @@ endef define Host/Compile $(call Build/Compile/HostPyMod,,\ - install --root="$(STAGING_DIR)/host" --prefix="" \ + install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \ --single-version-externally-managed \ ) endef diff --git a/lang/python-ply/Makefile b/lang/python-ply/Makefile index ba90ecb30c..0b0e5537f3 100644 --- a/lang/python-ply/Makefile +++ b/lang/python-ply/Makefile @@ -46,7 +46,7 @@ define Build/Compile endef define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)") endef define Host/Install diff --git a/lang/python-pycparser/Makefile b/lang/python-pycparser/Makefile index ff17417e7d..37e6c84038 100644 --- a/lang/python-pycparser/Makefile +++ b/lang/python-pycparser/Makefile @@ -47,7 +47,7 @@ define Build/Compile endef define Host/Compile - $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)") + $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)") endef define Host/Install diff --git a/lang/python-setuptools/Makefile b/lang/python-setuptools/Makefile index 6efc433a44..1f312229f9 100644 --- a/lang/python-setuptools/Makefile +++ b/lang/python-setuptools/Makefile @@ -63,7 +63,7 @@ endef define Host/Compile $(call Build/Compile/HostPyMod,,\ - install --root="$(HOST_BUILD_PREFIX)" --prefix="" \ + install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \ --single-version-externally-managed \ ) endef diff --git a/lang/python/files/python-host.mk b/lang/python/files/python-host.mk index ff2ed57d98..5e9f50999a 100644 --- a/lang/python/files/python-host.mk +++ b/lang/python/files/python-host.mk @@ -73,7 +73,7 @@ endef define HostPy/Compile/Default $(call Build/Compile/HostPyMod,,\ - install --root="$(HOST_BUILD_PREFIX)" --prefix="" \ + install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \ --single-version-externally-managed \ ) endef diff --git a/lang/python3/files/python3-host.mk b/lang/python3/files/python3-host.mk index e9677734fb..8ff6dd789a 100644 --- a/lang/python3/files/python3-host.mk +++ b/lang/python3/files/python3-host.mk @@ -73,7 +73,7 @@ endef define HostPy3/Compile/Default $(call Build/Compile/HostPy3Mod,,\ - install --root="$(HOST_BUILD_PREFIX)" --prefix="" \ + install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \ --single-version-externally-managed \ ) endef diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 0bf708ff24..7d56dee33c 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -90,7 +90,7 @@ endef define Host/Install # When ruby version is updated, make install asks in some cases before replace # an existing different file. Remove them before install and avoid the interaction - rm -f $(HOST_BUILD_PREFIX)/bin/rake + rm -f $(STAGING_DIR_HOSTPKG)/bin/rake $(call Host/Install/Default) endef diff --git a/libs/boost/Makefile b/libs/boost/Makefile index d645a3d3db..45e9c6282b 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -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 diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile index 013e23b160..48166e8fac 100644 --- a/libs/glib2/Makefile +++ b/libs/glib2/Makefile @@ -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 diff --git a/libs/libgd/Makefile b/libs/libgd/Makefile index 0309ff28ce..3749982641 100644 --- a/libs/libgd/Makefile +++ b/libs/libgd/Makefile @@ -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 diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile index 9be56482d0..27b353c166 100644 --- a/libs/libgee/Makefile +++ b/libs/libgee/Makefile @@ -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 diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index 27e5e0954e..999058632c 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -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) \ diff --git a/libs/libmraa/Makefile b/libs/libmraa/Makefile index 1bff5ff994..69085691b4 100644 --- a/libs/libmraa/Makefile +++ b/libs/libmraa/Makefile @@ -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 diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile index c1eaad16e6..cb7add6d98 100644 --- a/libs/libupm/Makefile +++ b/libs/libupm/Makefile @@ -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 diff --git a/libs/libxslt/Makefile b/libs/libxslt/Makefile index 955073a007..5ca407c4ab 100644 --- a/libs/libxslt/Makefile +++ b/libs/libxslt/Makefile @@ -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' \ diff --git a/libs/libzdb/Makefile b/libs/libzdb/Makefile index a8fcf30c27..c4f38f45bc 100644 --- a/libs/libzdb/Makefile +++ b/libs/libzdb/Makefile @@ -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)) diff --git a/libs/libzdb/patches/020-filterh-use-host-built-version.patch b/libs/libzdb/patches/020-filterh-use-host-built-version.patch index 1edfd77b3a..7495fbc0be 100644 --- a/libs/libzdb/patches/020-filterh-use-host-built-version.patch +++ b/libs/libzdb/patches/020-filterh-use-host-built-version.patch @@ -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 diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index f27fa1e398..05071468d2 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -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 diff --git a/libs/protobuf/Makefile b/libs/protobuf/Makefile index 1e70a12fce..93d538a0a1 100644 --- a/libs/protobuf/Makefile +++ b/libs/protobuf/Makefile @@ -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) \ diff --git a/multimedia/grilo/Makefile b/multimedia/grilo/Makefile index 66875d5dad..2daa0d5737 100644 --- a/multimedia/grilo/Makefile +++ b/multimedia/grilo/Makefile @@ -56,13 +56,13 @@ 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/ # Note: this are compiled elsewhere because grilo refuses to # generate VAPI files unless gobject-introspection exists; # OpenWrt does not yet have a gobject-introspection package. $(INSTALL_DATA) \ ./files/*.vapi \ - $(STAGING_DIR)/host/share/vala-0.30/vapi + $(STAGING_DIR_HOSTPKG)/share/vala-0.30/vapi endef define Package/grilo/install diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index 26ff4bdd66..e2d68384ab 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -93,8 +93,8 @@ MAKE_FLAGS += \ OPT="$(TARGET_CFLAGS)" \ INSTALLSUID="install -m 4755" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - RPCGEN_PATH=$(STAGING_DIR)/host/bin/rpcgen \ - RPCGEN=$(STAGING_DIR)/host/bin/rpcgen + RPCGEN_PATH=$(STAGING_DIR_HOSTPKG)/bin/rpcgen \ + RPCGEN=$(STAGING_DIR_HOSTPKG)/bin/rpcgen HOST_CFLAGS += -Dlinux @@ -125,8 +125,8 @@ define Host/Compile endef define Host/Install - $(INSTALL_DIR) $(STAGING_DIR)/host/bin - $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/rpcgen/rpcgen $(STAGING_DIR)/host/bin/rpcgen + $(INSTALL_DIR) $(STAGING_DIR_HOSTPKG)/bin + $(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/rpcgen/rpcgen $(STAGING_DIR_HOSTPKG)/bin/rpcgen endef define Package/nfs-kernel-server/install diff --git a/net/prosody/Makefile b/net/prosody/Makefile index 0942a626f3..f5a4ac63ee 100644 --- a/net/prosody/Makefile +++ b/net/prosody/Makefile @@ -50,7 +50,7 @@ define Build/Configure # this is *NOT* GNU autoconf stuff (cd $(PKG_BUILD_DIR); ./configure \ --prefix=/usr \ - --with-lua="$(STAGING_DIR)/host/bin" \ + --with-lua="$(STAGING_DIR_HOSTPKG)/bin" \ --with-lua-include="$(STAGING_DIR)/usr/include" \ --with-lua-lib="$(STAGING_DIR)/usr/lib" \ --cflags="$(TARGET_CFLAGS)" \ diff --git a/net/seafile-ccnet/patches/010-Makefile.patch b/net/seafile-ccnet/patches/010-Makefile.patch index d8b1ae8a01..a30abbd04e 100644 --- a/net/seafile-ccnet/patches/010-Makefile.patch +++ b/net/seafile-ccnet/patches/010-Makefile.patch @@ -11,12 +11,12 @@ diff -rupN seafile-ccnet-5.1.1.orig/lib/Makefile.am seafile-ccnet-5.1.1/lib/Make ccnet-object.h: ${ccnet_object_define} rm -f $@ - valac --pkg posix ${ccnet_object_define} -C -H ccnet-object.h -+ "$(STAGING_DIR)/host/bin/valac" --pkg posix ${ccnet_object_define} -C -H ccnet-object.h ++ "$(STAGING_DIR_HOSTPKG)/bin/valac" --pkg posix ${ccnet_object_define} -C -H ccnet-object.h ccnetobj.c: ${ccnet_object_define} rm -f $@ - valac -C --pkg posix ${ccnet_object_define} -+ "$(STAGING_DIR)/host/bin/valac" -C --pkg posix ${ccnet_object_define} ++ "$(STAGING_DIR_HOSTPKG)/bin/valac" -C --pkg posix ${ccnet_object_define} searpc_gen = searpc-signature.h searpc-marshal.h diff --git a/net/seafile-server/patches/050-libseafile-makefile-fixes.patch b/net/seafile-server/patches/050-libseafile-makefile-fixes.patch index d83a0974de..38c5ad4d16 100644 --- a/net/seafile-server/patches/050-libseafile-makefile-fixes.patch +++ b/net/seafile-server/patches/050-libseafile-makefile-fixes.patch @@ -12,7 +12,7 @@ diff -rupN seafile-server-5.1.1.orig/lib/Makefile.am seafile-server-5.1.1/lib/Ma seafile-object.h: ${seafile_object_define} rm -f $@ - valac --pkg posix ${seafile_object_define} -C -H seafile-object.h -+ "$(STAGING_DIR)/host/bin/valac" --pkg posix ${seafile_object_define} -C -H seafile-object.h ++ "$(STAGING_DIR_HOSTPKG)/bin/valac" --pkg posix ${seafile_object_define} -C -H seafile-object.h DISTCLEANFILES = ${searpc_gen} @@ -30,7 +30,7 @@ diff -rupN seafile-server-5.1.1.orig/lib/Makefile.am seafile-server-5.1.1/lib/Ma @rm -f vala.tmp @touch vala.tmp - valac -C --pkg posix $^ -+ "$(STAGING_DIR)/host/bin/valac" -C --pkg posix $^ ++ "$(STAGING_DIR_HOSTPKG)/bin/valac" -C --pkg posix $^ @mv -f vala.tmp $@ ${seafile_object_gen}: vala.stamp diff --git a/utils/dbus/Makefile b/utils/dbus/Makefile index 16ed227e2e..0560fc6a01 100644 --- a/utils/dbus/Makefile +++ b/utils/dbus/Makefile @@ -122,11 +122,11 @@ HOST_CONFIGURE_ARGS+= \ --disable-verbose-mode \ --disable-xml-docs \ --with-dbus-user=root \ - --with-dbus-daemondir="$(STAGIND_DIR)/host/bin" \ - --with-system-socket="$(STAGING_DIR)/host/var/run/dbus/system_bus_socket" \ - --with-system-pid-file="$(STAGING_DIR)/host/var/run/dbus.pid" \ + --with-dbus-daemondir="$(STAGING_DIR_HOSTPKG)/bin" \ + --with-system-socket="$(STAGING_DIR_HOSTPKG)/var/run/dbus/system_bus_socket" \ + --with-system-pid-file="$(STAGING_DIR_HOSTPKG)/var/run/dbus.pid" \ --without-x \ - --libexecdir="$(STAGING_DIR)/host/lib/dbus-1" + --libexecdir="$(STAGING_DIR_HOSTPKG)/lib/dbus-1" HOST_CONFIGURE_VARS+= \ ac_cv_have_abstract_sockets="yes" \