LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #3813 from NeoRaider/hostpkg 

Use STAGING_DIR_HOSTPKG where appropriate
lilik-openwrt-22.03
Matthias Schiffer 8 years ago
committed by GitHub
parent
9331f99784 4a984a8d60
commit
3823ef9bc4
36 changed files with 61 additions and 73 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      admin/sudo/Makefile
  2. +3
    -3
      lang/luajit/Makefile
  3. +2
    -2
      lang/lualanes/Makefile
  4. +1
    -1
      lang/luarocks/Makefile
  5. +1
    -1
      lang/node/Makefile
  6. +2
    -2
      lang/perl-xml-parser/Makefile
  7. +1
    -1
      lang/perl/Makefile
  8. +3
    -3
      lang/perl/perlmod.mk
  9. +1
    -1
      lang/php7/Makefile
  10. +1
    -1
      lang/python-cffi/Makefile
  11. +2
    -2
      lang/python-packages/Makefile
  12. +1
    -1
      lang/python-pip/Makefile
  13. +1
    -1
      lang/python-ply/Makefile
  14. +1
    -1
      lang/python-pycparser/Makefile
  15. +1
    -1
      lang/python-setuptools/Makefile
  16. +1
    -7
      lang/python/files/python-host.mk
  17. +1
    -7
      lang/python3/files/python3-host.mk
  18. +1
    -1
      lang/ruby/Makefile
  19. +2
    -2
      libs/boost/Makefile
  20. +1
    -1
      libs/glib2/Makefile
  21. +1
    -1
      libs/libgd/Makefile
  22. +2
    -2
      libs/libgee/Makefile
  23. +1
    -1
      libs/libgpg-error/Makefile
  24. +2
    -2
      libs/libmraa/Makefile
  25. +2
    -2
      libs/libupm/Makefile
  26. +1
    -1
      libs/libxslt/Makefile
  27. +2
    -2
      libs/libzdb/Makefile
  28. +1
    -1
      libs/libzdb/patches/020-filterh-use-host-built-version.patch
  29. +4
    -4
      libs/postgresql/Makefile
  30. +1
    -1
      libs/protobuf/Makefile
  31. +2
    -2
      multimedia/grilo/Makefile
  32. +4
    -4
      net/nfs-kernel-server/Makefile
  33. +1
    -1
      net/prosody/Makefile
  34. +2
    -2
      net/seafile-ccnet/patches/010-Makefile.patch
  35. +2
    -2
      net/seafile-server/patches/050-libseafile-makefile-fixes.patch
  36. +4
    -4
      utils/dbus/Makefile

+ 2
- 2
admin/sudo/Makefile View File

@ -64,8 +64,8 @@ define Host/Compile
endef endef
define Host/Install 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 endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))


+ 3
- 3
lang/luajit/Makefile View File

@ -75,16 +75,16 @@ endef
define Host/Compile define Host/Compile
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
DPREFIX=$(STAGING_DIR)/host \
DPREFIX=$(STAGING_DIR_HOSTPKG) \
TARGET_CFLAGS="$(HOST_CFLAGS)" \ TARGET_CFLAGS="$(HOST_CFLAGS)" \
TARGET_LDFLAGS="$(HOST_LDFLAGS)" TARGET_LDFLAGS="$(HOST_LDFLAGS)"
endef endef
define Host/Install define Host/Install
$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
DPREFIX=$(STAGING_DIR)/host \
DPREFIX=$(STAGING_DIR_HOSTPKG) \
install 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 endef
$(eval $(call HostBuild,luajit)) $(eval $(call HostBuild,luajit))


+ 2
- 2
lang/lualanes/Makefile View File

@ -42,8 +42,8 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) all \ $(MAKE) -C $(PKG_BUILD_DIR) all \
CC="$(TARGET_CC)" \ 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" OPT_FLAGS="$(TARGET_CFLAGS) --std=c99 -Dpthread_yield=sched_yield"
endef endef


+ 1
- 1
lang/luarocks/Makefile View File

@ -41,7 +41,7 @@ endef
CONFIGURE_ARGS = \ CONFIGURE_ARGS = \
--prefix=$(CONFIGURE_PREFIX) \ --prefix=$(CONFIGURE_PREFIX) \
--sysconfdir=/etc \ --sysconfdir=/etc \
--with-lua=$(STAGING_DIR)/host
--with-lua=$(STAGING_DIR_HOSTPKG)
CONFIGURE_VARS = \ CONFIGURE_VARS = \
LUAROCKS_UNAME_S="Linux" \ LUAROCKS_UNAME_S="Linux" \


+ 1
- 1
lang/node/Makefile View File

@ -72,7 +72,7 @@ HOST_CONFIGURE_VARS:=
HOST_CONFIGURE_ARGS:= \ HOST_CONFIGURE_ARGS:= \
--dest-os=linux \ --dest-os=linux \
--without-snapshot \ --without-snapshot \
--prefix=$(HOST_BUILD_PREFIX)
--prefix=$(STAGING_DIR_HOSTPKG)
HOST_CONFIGURE_CMD:=python ./configure HOST_CONFIGURE_CMD:=python ./configure


+ 2
- 2
lang/perl-xml-parser/Makefile View File

@ -25,8 +25,8 @@ HOST_BUILD_DEPENDS:=perl/host expat/host
EXPAT_LIBPATH:=$(STAGING_DIR)/usr/lib EXPAT_LIBPATH:=$(STAGING_DIR)/usr/lib
EXPAT_INCPATH=$(STAGING_DIR)/usr/include 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)/package.mk
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk


+ 1
- 1
lang/perl/Makefile View File

@ -35,7 +35,7 @@ PKG_BUILD_PARALLEL:=1
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1
# Variables used during configuration/build # 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 # Filter -g3, it will break Compress-Raw-Zlib
TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS)) TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS))


+ 3
- 3
lang/perl/perlmod.mk View File

@ -4,12 +4,12 @@
PERL_VERSION:=5.22 PERL_VERSION:=5.22
# Build environment # Build environment
HOST_PERL_PREFIX:=$(STAGING_DIR)/host/usr
HOST_PERL_PREFIX:=$(STAGING_DIR_HOSTPKG)/usr
ifneq ($(CONFIG_USE_GLIBC),) ifneq ($(CONFIG_USE_GLIBC),)
EXTRA_LIBS:=bsd EXTRA_LIBS:=bsd
EXTRA_LIBDIRS:=$(STAGING_DIR)/lib EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
endif 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) MOD_CFLAGS_PERL:=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)
ifdef CONFIG_PERL_THREADS ifdef CONFIG_PERL_THREADS
@ -26,7 +26,7 @@ define perlmod/host/relink
rm -f $(1)/Makefile.aperl rm -f $(1)/Makefile.aperl
$(MAKE) -C $(1) perl $(MAKE) -C $(1) perl
$(CP) $(1)/perl $(PERL_CMD) $(CP) $(1)/perl $(PERL_CMD)
$(CP) $(1)/perl $(STAGING_DIR)/host/usr/bin/perl
$(CP) $(1)/perl $(STAGING_DIR_HOSTPKG)/usr/bin/perl
endef endef
define perlmod/host/Configure define perlmod/host/Configure


+ 1
- 1
lang/php7/Makefile View File

@ -444,7 +444,7 @@ CONFIGURE_VARS+= \
ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \ ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \
php_cv_cc_rpath="no" \ php_cv_cc_rpath="no" \
iconv_impl_name="gnu_libiconv" \ 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 define Package/php7/conffiles
/etc/php.ini /etc/php.ini


+ 1
- 1
lang/python-cffi/Makefile View File

@ -45,7 +45,7 @@ define Build/Compile
endef endef
define Host/Compile define Host/Compile
$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)")
$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
endef endef
define Host/Install define Host/Install


+ 2
- 2
lang/python-packages/Makefile View File

@ -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-extra-deps:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-extra-deps))
CONFIG_PACKAGE_python-packages-pip-opts:=$(call qstrip,$(CONFIG_PACKAGE_python-packages-pip-opts)) 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) 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)) 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-index-url), --index-url $(CONFIG_PACKAGE_python-packages-index-url)) \
$(if $(CONFIG_PACKAGE_python-packages-pip-opts), $(CONFIG_PACKAGE_python-packages-pip-opts)) \ $(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_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) HOST_PYTHON_PIP_INSTALL_CLEANUP:=$(call HOST_PYTHON_PIP_INSTALL,$(PKG_INSTALL_DIR)/_cleanup,/usr)


+ 1
- 1
lang/python-pip/Makefile View File

@ -62,7 +62,7 @@ endef
define Host/Compile define Host/Compile
$(call Build/Compile/HostPyMod,,\ $(call Build/Compile/HostPyMod,,\
install --root="$(STAGING_DIR)/host" --prefix="" \
install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \
--single-version-externally-managed \ --single-version-externally-managed \
) )
endef endef


+ 1
- 1
lang/python-ply/Makefile View File

@ -46,7 +46,7 @@ define Build/Compile
endef endef
define Host/Compile define Host/Compile
$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)")
$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
endef endef
define Host/Install define Host/Install


+ 1
- 1
lang/python-pycparser/Makefile View File

@ -47,7 +47,7 @@ define Build/Compile
endef endef
define Host/Compile define Host/Compile
$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(HOST_BUILD_PREFIX)")
$(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
endef endef
define Host/Install define Host/Install


+ 1
- 1
lang/python-setuptools/Makefile View File

@ -63,7 +63,7 @@ endef
define Host/Compile define Host/Compile
$(call Build/Compile/HostPyMod,,\ $(call Build/Compile/HostPyMod,,\
install --root="$(HOST_BUILD_PREFIX)" --prefix="" \
install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \
--single-version-externally-managed \ --single-version-externally-managed \
) )
endef endef


+ 1
- 7
lang/python/files/python-host.mk View File

@ -11,12 +11,6 @@ __python_host_mk_inc=1
# For PYTHON_VERSION # For PYTHON_VERSION
$(call include_mk, python-version.mk) $(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_DIR:=$(STAGING_DIR_HOSTPKG)
HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION) HOST_PYTHON_INC_DIR:=$(HOST_PYTHON_DIR)/include/python$(PYTHON_VERSION)
HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION) HOST_PYTHON_LIB_DIR:=$(HOST_PYTHON_DIR)/lib/python$(PYTHON_VERSION)
@ -79,7 +73,7 @@ endef
define HostPy/Compile/Default define HostPy/Compile/Default
$(call Build/Compile/HostPyMod,,\ $(call Build/Compile/HostPyMod,,\
install --root="$(HOST_BUILD_PREFIX)" --prefix="" \
install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \
--single-version-externally-managed \ --single-version-externally-managed \
) )
endef endef


+ 1
- 7
lang/python3/files/python3-host.mk View File

@ -11,12 +11,6 @@ __python3_host_mk_inc=1
# For PYTHON3_VERSION # For PYTHON3_VERSION
$(call include_mk, python3-version.mk) $(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_DIR:=$(STAGING_DIR_HOSTPKG)
HOST_PYTHON3_INC_DIR:=$(HOST_PYTHON3_DIR)/include/python$(PYTHON3_VERSION) HOST_PYTHON3_INC_DIR:=$(HOST_PYTHON3_DIR)/include/python$(PYTHON3_VERSION)
HOST_PYTHON3_LIB_DIR:=$(HOST_PYTHON3_DIR)/lib/python$(PYTHON3_VERSION) HOST_PYTHON3_LIB_DIR:=$(HOST_PYTHON3_DIR)/lib/python$(PYTHON3_VERSION)
@ -79,7 +73,7 @@ endef
define HostPy3/Compile/Default define HostPy3/Compile/Default
$(call Build/Compile/HostPy3Mod,,\ $(call Build/Compile/HostPy3Mod,,\
install --root="$(HOST_BUILD_PREFIX)" --prefix="" \
install --root="$(STAGING_DIR_HOSTPKG)" --prefix="" \
--single-version-externally-managed \ --single-version-externally-managed \
) )
endef endef


+ 1
- 1
lang/ruby/Makefile View File

@ -90,7 +90,7 @@ endef
define Host/Install define Host/Install
# When ruby version is updated, make install asks in some cases before replace # 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 # 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) $(call Host/Install/Default)
endef endef


+ 2
- 2
libs/boost/Makefile View File

@ -417,11 +417,11 @@ endef
define Host/Install define Host/Install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(STAGING_DIR)/host/bin
$(STAGING_DIR_HOSTPKG)/bin
$(CP) \ $(CP) \
$(HOST_BUILD_DIR)/tools/build/src/engine/bin.*/b2 \ $(HOST_BUILD_DIR)/tools/build/src/engine/bin.*/b2 \
$(STAGING_DIR)/host/bin/
$(STAGING_DIR_HOSTPKG)/bin/
endef endef
define Package/boost/Default/install define Package/boost/Default/install


+ 1
- 1
libs/glib2/Makefile View File

@ -61,7 +61,7 @@ CONFIGURE_ARGS += \
CONFIGURE_VARS += \ CONFIGURE_VARS += \
glib_cv_stack_grows=no \ glib_cv_stack_grows=no \
glib_cv_uscore=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_mmap_fixed_mapped=yes \
ac_cv_func_posix_getpwuid_r=yes \ ac_cv_func_posix_getpwuid_r=yes \
ac_cv_func_posix_getgrgid_r=yes ac_cv_func_posix_getgrgid_r=yes


+ 1
- 1
libs/libgd/Makefile View File

@ -54,7 +54,7 @@ CONFIGURE_ARGS += \
--without-iconv --without-iconv
CONFIGURE_VARS += \ CONFIGURE_VARS += \
LIBPNG12_CONFIG="$(STAGING_DIR)/host/bin/libpng12-config" \
LIBPNG12_CONFIG="$(STAGING_DIR_HOSTPKG)/bin/libpng12-config" \
ac_cv_header_iconv_h=no ac_cv_header_iconv_h=no
define Build/InstallDev define Build/InstallDev


+ 2
- 2
libs/libgee/Makefile View File

@ -57,10 +57,10 @@ define Build/InstallDev
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
$(1)/usr/lib/pkgconfig/ $(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) \ $(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/share/vala/vapi/* \ $(PKG_INSTALL_DIR)/usr/share/vala/vapi/* \
$(STAGING_DIR)/host/share/vala-0.30/vapi
$(STAGING_DIR_HOSTPKG)/share/vala-0.30/vapi
endef endef
define Package/libgee/install define Package/libgee/install


+ 1
- 1
libs/libgpg-error/Makefile View File

@ -51,7 +51,7 @@ define Build/InstallDev
$(SED) \ $(SED) \
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
$(2)/bin/gpg-error-config $(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_DIR) $(1)/usr/include
$(INSTALL_DATA) \ $(INSTALL_DATA) \


+ 2
- 2
libs/libmraa/Makefile View File

@ -28,8 +28,8 @@ include $(INCLUDE_DIR)/cmake.mk
CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \ CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \
-DENABLEEXAMPLES=0 \ -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 TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/node


+ 2
- 2
libs/libupm/Makefile View File

@ -36,8 +36,8 @@ UPM_MODULES:= \
th02 tm1637 tsl2561 ttp223 ublox6 uln200xa waterlevel wheelencoder wt5001 yg1006 zfm20 th02 tm1637 tsl2561 ttp223 ublox6 uln200xa waterlevel wheelencoder wt5001 yg1006 zfm20
CMAKE_OPTIONS=-DBUILDARCH=$(CONFIG_ARCH) \ 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 define Package/libupm/Default
SECTION:=libs SECTION:=libs


+ 1
- 1
libs/libxslt/Makefile View File

@ -83,7 +83,7 @@ define Build/InstallDev/Xslt
$(PKG_INSTALL_DIR)/usr/bin/xslt-config \ $(PKG_INSTALL_DIR)/usr/bin/xslt-config \
$(2)/bin/ $(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) \ $(SED) \
's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \


+ 2
- 2
libs/libzdb/Makefile View File

@ -63,8 +63,8 @@ define Host/Compile
endef endef
define Host/Install 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 endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))


+ 1
- 1
libs/libzdb/patches/020-filterh-use-host-built-version.patch View File

@ -14,7 +14,7 @@ diff -rupN libzdb-3.0.orig/Makefile.am libzdb-3.0/Makefile.am
RE2C = @RE2C@ RE2C = @RE2C@
RE2CFLAGS = -b RE2CFLAGS = -b
-FILTERH = ./tools/bin/filterh -FILTERH = ./tools/bin/filterh
+FILTERH = $(STAGING_DIR)/host/bin/filterh
+FILTERH = $(STAGING_DIR_HOSTPKG)/bin/filterh
AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS) AM_CPPFLAGS = $(CPPFLAGS) $(DBCPPFLAGS)
AM_CPPFLAGS += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/exceptions AM_CPPFLAGS += -Isrc -Isrc/util -Isrc/net -Isrc/db -Isrc/exceptions

+ 4
- 4
libs/postgresql/Makefile View File

@ -147,14 +147,14 @@ endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR)/usr/bin/ $(INSTALL_DIR) $(STAGING_DIR)/usr/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/src/bin/pg_config/pg_config $(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 endef
define Build/Configure define Build/Configure
$(Build/Configure/Default) $(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 endef
TARGET_CFLAGS += $(FPIC) -lpthread TARGET_CFLAGS += $(FPIC) -lpthread


+ 1
- 1
libs/protobuf/Makefile View File

@ -41,7 +41,7 @@ define Package/protobuf/description
of its internal RPC protocols and file formats. of its internal RPC protocols and file formats.
endef endef
CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR)/host/bin/protoc
CONFIGURE_ARGS += --with-protoc=$(STAGING_DIR_HOSTPKG)/bin/protoc
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) \ $(INSTALL_DIR) \


+ 2
- 2
multimedia/grilo/Makefile View File

@ -56,13 +56,13 @@ define Build/InstallDev
$(INSTALL_DATA) \ $(INSTALL_DATA) \
$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
$(1)/usr/lib/pkgconfig/ $(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 # Note: this are compiled elsewhere because grilo refuses to
# generate VAPI files unless gobject-introspection exists; # generate VAPI files unless gobject-introspection exists;
# OpenWrt does not yet have a gobject-introspection package. # OpenWrt does not yet have a gobject-introspection package.
$(INSTALL_DATA) \ $(INSTALL_DATA) \
./files/*.vapi \ ./files/*.vapi \
$(STAGING_DIR)/host/share/vala-0.30/vapi
$(STAGING_DIR_HOSTPKG)/share/vala-0.30/vapi
endef endef
define Package/grilo/install define Package/grilo/install


+ 4
- 4
net/nfs-kernel-server/Makefile View File

@ -93,8 +93,8 @@ MAKE_FLAGS += \
OPT="$(TARGET_CFLAGS)" \ OPT="$(TARGET_CFLAGS)" \
INSTALLSUID="install -m 4755" \ INSTALLSUID="install -m 4755" \
DESTDIR="$(PKG_INSTALL_DIR)" \ 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 HOST_CFLAGS += -Dlinux
@ -125,8 +125,8 @@ define Host/Compile
endef endef
define Host/Install 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 endef
define Package/nfs-kernel-server/install define Package/nfs-kernel-server/install


+ 1
- 1
net/prosody/Makefile View File

@ -50,7 +50,7 @@ define Build/Configure
# this is *NOT* GNU autoconf stuff # this is *NOT* GNU autoconf stuff
(cd $(PKG_BUILD_DIR); ./configure \ (cd $(PKG_BUILD_DIR); ./configure \
--prefix=/usr \ --prefix=/usr \
--with-lua="$(STAGING_DIR)/host/bin" \
--with-lua="$(STAGING_DIR_HOSTPKG)/bin" \
--with-lua-include="$(STAGING_DIR)/usr/include" \ --with-lua-include="$(STAGING_DIR)/usr/include" \
--with-lua-lib="$(STAGING_DIR)/usr/lib" \ --with-lua-lib="$(STAGING_DIR)/usr/lib" \
--cflags="$(TARGET_CFLAGS)" \ --cflags="$(TARGET_CFLAGS)" \


+ 2
- 2
net/seafile-ccnet/patches/010-Makefile.patch View File

@ -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} ccnet-object.h: ${ccnet_object_define}
rm -f $@ rm -f $@
- valac --pkg posix ${ccnet_object_define} -C -H ccnet-object.h - 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} ccnetobj.c: ${ccnet_object_define}
rm -f $@ rm -f $@
- valac -C --pkg posix ${ccnet_object_define} - 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 searpc_gen = searpc-signature.h searpc-marshal.h


+ 2
- 2
net/seafile-server/patches/050-libseafile-makefile-fixes.patch View File

@ -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} seafile-object.h: ${seafile_object_define}
rm -f $@ rm -f $@
- valac --pkg posix ${seafile_object_define} -C -H seafile-object.h - 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} 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 @rm -f vala.tmp
@touch vala.tmp @touch vala.tmp
- valac -C --pkg posix $^ - valac -C --pkg posix $^
+ "$(STAGING_DIR)/host/bin/valac" -C --pkg posix $^
+ "$(STAGING_DIR_HOSTPKG)/bin/valac" -C --pkg posix $^
@mv -f vala.tmp $@ @mv -f vala.tmp $@
${seafile_object_gen}: vala.stamp ${seafile_object_gen}: vala.stamp


+ 4
- 4
utils/dbus/Makefile View File

@ -122,11 +122,11 @@ HOST_CONFIGURE_ARGS+= \
--disable-verbose-mode \ --disable-verbose-mode \
--disable-xml-docs \ --disable-xml-docs \
--with-dbus-user=root \ --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 \ --without-x \
--libexecdir="$(STAGING_DIR)/host/lib/dbus-1"
--libexecdir="$(STAGING_DIR_HOSTPKG)/lib/dbus-1"
HOST_CONFIGURE_VARS+= \ HOST_CONFIGURE_VARS+= \
ac_cv_have_abstract_sockets="yes" \ ac_cv_have_abstract_sockets="yes" \


Write Preview
Loading…
Cancel
Save