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

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

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
lilik-openwrt-22.03
Felix Fietkau 9 years ago
parent
f12aae60ad
commit
9f8e5aca34
34 changed files with 75 additions and 83 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      admin/sudo/Makefile
  2. +3
    -12
      admin/sudo/patches/010-cross-compile-fixes.patch
  3. +2
    -2
      lang/lualanes/Makefile
  4. +1
    -1
      lang/luarocks/Makefile
  5. +1
    -1
      lang/node-arduino-firmata/Makefile
  6. +1
    -1
      lang/node-cylon/Makefile
  7. +1
    -1
      lang/node-hid/Makefile
  8. +1
    -1
      lang/node-serialport/Makefile
  9. +1
    -1
      lang/node/Makefile
  10. +2
    -2
      lang/perl-xml-parser/Makefile
  11. +1
    -1
      lang/perl/Makefile
  12. +3
    -3
      lang/perl/perlmod.mk
  13. +4
    -4
      lang/php5/Makefile
  14. +2
    -2
      lang/php5/pecl.mk
  15. +1
    -1
      lang/python-cffi/Makefile
  16. +1
    -1
      lang/python-ply/Makefile
  17. +1
    -1
      lang/python-pycparser/Makefile
  18. +1
    -1
      lang/python-setuptools/Makefile
  19. +8
    -8
      lang/python/Makefile
  20. +4
    -4
      lang/python/files/python-host.mk
  21. +2
    -2
      lang/python/files/python-package.mk
  22. +6
    -6
      lang/python3/Makefile
  23. +2
    -2
      lang/python3/files/python3-package.mk
  24. +2
    -2
      libs/boost/Makefile
  25. +2
    -2
      libs/libgee/Makefile
  26. +2
    -2
      libs/libmraa/Makefile
  27. +2
    -2
      libs/libsearpc/Makefile
  28. +2
    -2
      libs/libupm/Makefile
  29. +2
    -2
      libs/libzdb/Makefile
  30. +1
    -1
      libs/libzdb/patches/020-filterh-use-host-built-version.patch
  31. +1
    -1
      libs/protobuf/Makefile
  32. +2
    -2
      multimedia/grilo/Makefile
  33. +4
    -3
      net/nfs-kernel-server/Makefile
  34. +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) $(STAGING_DIR_HOST)/bin
$(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR_HOST)/bin/
$(INSTALL_DIR) $(STAGING_DIR)/host/bin
$(CP) $(HOST_BUILD_DIR)/lib/util/mksig{list,name} $(STAGING_DIR)/host/bin/
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))


+ 3
- 12
admin/sudo/patches/010-cross-compile-fixes.patch View File

@ -1,25 +1,16 @@
diff -rupN sudo-1.8.11p2.orig/lib/util/Makefile.in sudo-1.8.11p2/lib/util/Makefile.in diff -rupN sudo-1.8.11p2.orig/lib/util/Makefile.in sudo-1.8.11p2/lib/util/Makefile.in
--- sudo-1.8.11p2.orig/lib/util/Makefile.in 2014-10-07 22:26:20.000000000 +0200 --- sudo-1.8.11p2.orig/lib/util/Makefile.in 2014-10-07 22:26:20.000000000 +0200
+++ sudo-1.8.11p2/lib/util/Makefile.in 2014-12-09 21:44:35.610041162 +0100 +++ sudo-1.8.11p2/lib/util/Makefile.in 2014-12-09 21:44:35.610041162 +0100
@@ -17,6 +17,8 @@
# @configure_input@
#
+include $(TOPDIR)/rules.mk
+
#### Start of system configuration section. ####
srcdir = @srcdir@
@@ -142,10 +144,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@
@@ -142,10 +142,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@
esac esac
siglist.c: mksiglist siglist.c: mksiglist
- ./mksiglist > $@ - ./mksiglist > $@
+ $(STAGING_DIR_HOST)/bin/mksiglist > $@
+ mksiglist > $@
signame.c: mksigname signame.c: mksigname
- ./mksigname > $@ - ./mksigname > $@
+ $(STAGING_DIR_HOST)/bin/mksigname > $@
+ mksigname > $@
mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@

+ 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)/host/bin/lua" \
LUAC="$(STAGING_DIR)/host/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)/host
define Build/Compile define Build/Compile
$(call Build/Compile/Default,build) $(call Build/Compile/Default,build)


+ 1
- 1
lang/node-arduino-firmata/Makefile View File

@ -53,7 +53,7 @@ define Build/Compile
npm_config_arch=$(CONFIG_ARCH) \ npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
$(STAGING_DIR_HOST)/bin/npm install -g $(PKG_BUILD_DIR)
$(STAGING_DIR)/host/bin/npm install -g $(PKG_BUILD_DIR)
endef endef
define Package/node-arduino-firmata/install define Package/node-arduino-firmata/install


+ 1
- 1
lang/node-cylon/Makefile View File

@ -68,7 +68,7 @@ define Build/Compile
npm_config_arch=$(CONFIG_ARCH) \ npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
$(STAGING_DIR_HOST)/bin/npm install -g $(PKG_BUILD_DIR)
$(STAGING_DIR)/host/bin/npm install -g $(PKG_BUILD_DIR)
endef endef
define Package/node-cylon/install define Package/node-cylon/install


+ 1
- 1
lang/node-hid/Makefile View File

@ -50,7 +50,7 @@ define Build/Compile
npm_config_arch=$(CONFIG_ARCH) \ npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
$(STAGING_DIR_HOST)/bin/npm install -g $(PKG_BUILD_DIR)
$(STAGING_DIR)/host/bin/npm install -g $(PKG_BUILD_DIR)
endef endef
define Package/node-hid/install define Package/node-hid/install


+ 1
- 1
lang/node-serialport/Makefile View File

@ -50,7 +50,7 @@ define Build/Compile
npm_config_arch=$(CONFIG_ARCH) \ npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \ npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \ PREFIX="$(PKG_INSTALL_DIR)/usr/" \
$(STAGING_DIR_HOST)/bin/npm install -g $(PKG_BUILD_DIR)
$(STAGING_DIR)/host/bin/npm install -g $(PKG_BUILD_DIR)
endef endef
define Package/node-serialport/install define Package/node-serialport/install


+ 1
- 1
lang/node/Makefile View File

@ -57,7 +57,7 @@ HOST_CONFIGURE_VARS:=
HOST_CONFIGURE_ARGS:= \ HOST_CONFIGURE_ARGS:= \
--dest-os=linux \ --dest-os=linux \
--without-snapshot \ --without-snapshot \
--prefix=$(STAGING_DIR_HOST)/
--prefix=$(STAGING_DIR)/host/
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)/host/lib
HOST_EXPAT_INCPATH=$(STAGING_DIR)/host/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)/host/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)/host/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)/host/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)/host/usr/bin/perl
endef endef
define perlmod/host/Configure define perlmod/host/Configure


+ 4
- 4
lang/php5/Makefile View File

@ -491,10 +491,10 @@ define Build/InstallDev
mkdir -p $(PKG_BUILD_DIR)/staging/usr/bin mkdir -p $(PKG_BUILD_DIR)/staging/usr/bin
make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/staging make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/staging
rm -f $(PKG_BUILD_DIR)/staging/usr/bin/php rm -f $(PKG_BUILD_DIR)/staging/usr/bin/php
$(CP) $(PKG_BUILD_DIR)/staging/* $(STAGING_DIR_HOST)
sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize
sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize
sed -i -e "s#prefix=\"/usr\"#prefix=\"$(STAGING_DIR_HOST)/usr\"#" $(STAGING_DIR_HOST)/usr/bin/php-config
$(CP) $(PKG_BUILD_DIR)/staging/* $(STAGING_DIR)/host
sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR)/host/usr'#" $(STAGING_DIR)/host/usr/bin/phpize
sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR)/host/usr'#" $(STAGING_DIR)/host/usr/bin/phpize
sed -i -e "s#prefix=\"/usr\"#prefix=\"$(STAGING_DIR)/host/usr\"#" $(STAGING_DIR)/host/usr/bin/php-config
endef endef
define BuildModule define BuildModule


+ 2
- 2
lang/php5/pecl.mk View File

@ -15,11 +15,11 @@ endef
define Build/Prepare define Build/Prepare
$(Build/Prepare/Default) $(Build/Prepare/Default)
( cd $(PKG_BUILD_DIR); $(STAGING_DIR_HOST)/usr/bin/phpize )
( cd $(PKG_BUILD_DIR); $(STAGING_DIR)/host/usr/bin/phpize )
endef endef
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--with-php-config=$(STAGING_DIR_HOST)/usr/bin/php-config
--with-php-config=$(STAGING_DIR)/host/usr/bin/php-config
define PECLPackage define PECLPackage


+ 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="/usr" --root="$(STAGING_DIR_HOST)")
$(call Build/Compile/HostPyMod,,install --prefix="/usr" --root="$(STAGING_DIR)/host")
endef endef
define Host/Install define Host/Install


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

@ -53,7 +53,7 @@ define Build/InstallDev
endef endef
define Host/Compile define Host/Compile
$(call Build/Compile/HostPyMod,,install --prefix="/usr" --root="$(STAGING_DIR_HOST)")
$(call Build/Compile/HostPyMod,,install --prefix="/usr" --root="$(STAGING_DIR)/host")
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="/usr" --root="$(STAGING_DIR_HOST)")
$(call Build/Compile/HostPyMod,,install --prefix="/usr" --root="$(STAGING_DIR)/host")
endef endef
define Host/Install define Host/Install


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

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


+ 8
- 8
lang/python/Makefile View File

@ -144,13 +144,13 @@ define Build/InstallDev
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
$(1)/usr/include/ $(1)/usr/include/
$(CP) \ $(CP) \
$(STAGING_DIR_HOST)/usr/lib/python$(PYTHON_VERSION) \
$(STAGING_DIR)/host/usr/lib/python$(PYTHON_VERSION) \
$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(CP) \ $(CP) \
$(STAGING_DIR_HOST)/lib/pkgconfig/python.pc \
$(STAGING_DIR_HOST)/lib/pkgconfig/python2.pc \
$(STAGING_DIR_HOST)/lib/pkgconfig/python-$(PYTHON_VERSION).pc \
$(STAGING_DIR)/host/lib/pkgconfig/python.pc \
$(STAGING_DIR)/host/lib/pkgconfig/python2.pc \
$(STAGING_DIR)/host/lib/pkgconfig/python-$(PYTHON_VERSION).pc \
$(1)/usr/lib/pkgconfig $(1)/usr/lib/pkgconfig
$(CP) \ $(CP) \
$(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \ $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/config \
@ -221,16 +221,16 @@ HOST_CONFIGURE_ARGS+= \
--without-cxx-main \ --without-cxx-main \
--without-pymalloc \ --without-pymalloc \
--with-threads \ --with-threads \
--prefix=$(STAGING_DIR_HOST)/usr \
--with-system-expat=$(STAGING_DIR_HOST) \
--prefix=$(STAGING_DIR)/host/usr \
--with-system-expat=$(STAGING_DIR)/host \
--with-ensurepip=upgrade \ --with-ensurepip=upgrade \
CONFIG_SITE= \ CONFIG_SITE= \
CFLAGS="$(HOST_CFLAGS)" CFLAGS="$(HOST_CFLAGS)"
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
$(INSTALL_DIR) $(STAGING_DIR)/host/bin/
$(MAKE) -C $(HOST_BUILD_DIR) install $(MAKE) -C $(HOST_BUILD_DIR) install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen2
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen2
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))


+ 4
- 4
lang/python/files/python-host.mk View File

@ -5,15 +5,15 @@
# See /LICENSE for more information. # See /LICENSE for more information.
# #
HOST_PYTHON_INC_DIR:=$(STAGING_DIR_HOST)/include/python$(PYTHON_VERSION)
HOST_PYTHON_INC_DIR:=$(STAGING_DIR)/host/include/python$(PYTHON_VERSION)
HOST_PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages HOST_PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR_HOST)/$(HOST_PYTHON_PKG_DIR)
HOST_PYTHONPATH:=$(HOST_PYTHON_LIB_DIR):$(STAGING_DIR)/host/$(HOST_PYTHON_PKG_DIR)
define HostPython define HostPython
if [ "$(strip $(3))" == "HOST" ]; then \ if [ "$(strip $(3))" == "HOST" ]; then \
export PYTHONPATH="$(HOST_PYTHONPATH)"; \ export PYTHONPATH="$(HOST_PYTHONPATH)"; \
export _python_sysroot="$(STAGING_DIR_HOST)"; \
export _python_sysroot="$(STAGING_DIR)/host"; \
else \ else \
export PYTHONPATH="$(PYTHONPATH)"; \ export PYTHONPATH="$(PYTHONPATH)"; \
export _python_sysroot="$(STAGING_DIR)"; \ export _python_sysroot="$(STAGING_DIR)"; \
@ -29,7 +29,7 @@ endef
# These configure args are needed in detection of path to Python header files # These configure args are needed in detection of path to Python header files
# using autotools. # using autotools.
HOST_CONFIGURE_ARGS += \ HOST_CONFIGURE_ARGS += \
_python_sysroot="$(STAGING_DIR_HOST)" \
_python_sysroot="$(STAGING_DIR)/host" \
_python_prefix="/usr" \ _python_prefix="/usr" \
_python_exec_prefix="/usr" _python_exec_prefix="/usr"


+ 2
- 2
lang/python/files/python-package.mk View File

@ -17,8 +17,8 @@ PYTHON_PKG_DIR:=/usr/lib/python$(PYTHON_VERSION)/site-packages
PYTHON:=python$(PYTHON_VERSION) PYTHON:=python$(PYTHON_VERSION)
HOST_PYTHON_LIB_DIR:=$(STAGING_DIR_HOST)/usr/lib/python$(PYTHON_VERSION)
HOST_PYTHON_BIN:=$(STAGING_DIR_HOST)/bin/python2
HOST_PYTHON_LIB_DIR:=$(STAGING_DIR)/host/usr/lib/python$(PYTHON_VERSION)
HOST_PYTHON_BIN:=$(STAGING_DIR)/host/bin/python2
PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR) PYTHONPATH:=$(PYTHON_LIB_DIR):$(STAGING_DIR)/$(PYTHON_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)


+ 6
- 6
lang/python3/Makefile View File

@ -146,7 +146,7 @@ define Build/InstallDev
$(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \ $(PKG_INSTALL_DIR)/usr/include/python$(PYTHON_VERSION) \
$(1)/usr/include/ $(1)/usr/include/
$(CP) \ $(CP) \
$(STAGING_DIR_HOST)/lib/python$(PYTHON_VERSION) \
$(STAGING_DIR)/host/lib/python$(PYTHON_VERSION) \
$(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \ $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* \
$(1)/usr/lib/ $(1)/usr/lib/
$(CP) \ $(CP) \
@ -216,8 +216,8 @@ HOST_CONFIGURE_ARGS+= \
--without-cxx-main \ --without-cxx-main \
--without-pymalloc \ --without-pymalloc \
--with-threads \ --with-threads \
--prefix=$(STAGING_DIR_HOST) \
--with-system-expat=$(STAGING_DIR_HOST) \
--prefix=$(STAGING_DIR)/host \
--with-system-expat=$(STAGING_DIR)/host \
--with-ensurepip=upgrade \ --with-ensurepip=upgrade \
CONFIG_SITE= \ CONFIG_SITE= \
CFLAGS="$(HOST_CFLAGS)" CFLAGS="$(HOST_CFLAGS)"
@ -228,10 +228,10 @@ define Host/Compile
endef endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
$(INSTALL_DIR) $(STAGING_DIR)/host/bin/
$(MAKE) -C $(HOST_BUILD_DIR) install $(MAKE) -C $(HOST_BUILD_DIR) install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen3
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR_HOST)/bin/_freeze_importlib
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR)/host/bin/pgen3
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Programs/_freeze_importlib $(STAGING_DIR)/host/bin/_freeze_importlib
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))


+ 2
- 2
lang/python3/files/python3-package.mk View File

@ -20,8 +20,8 @@ PYTHON3_PKG_DIR:=/usr/lib/python$(PYTHON3_VERSION)/site-packages
PYTHON3:=python$(PYTHON3_VERSION) PYTHON3:=python$(PYTHON3_VERSION)
HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR_HOST)/lib/python$(PYTHON3_VERSION)
HOST_PYTHON3_BIN:=$(STAGING_DIR_HOST)/bin/python3
HOST_PYTHON3_LIB_DIR:=$(STAGING_DIR)/host/lib/python$(PYTHON3_VERSION)
HOST_PYTHON3_BIN:=$(STAGING_DIR)/host/bin/python3
PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR) PYTHON3PATH:=$(PYTHON3_LIB_DIR):$(STAGING_DIR)/$(PYTHON3_PKG_DIR):$(PKG_INSTALL_DIR)/$(PYTHON3_PKG_DIR)
define HostPython3 define HostPython3


+ 2
- 2
libs/boost/Makefile View File

@ -397,11 +397,11 @@ endef
define Host/Install define Host/Install
$(INSTALL_DIR) \ $(INSTALL_DIR) \
$(STAGING_DIR_HOST)/bin
$(STAGING_DIR)/host/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)/host/bin/
endef endef
define Package/boost/Default/install define Package/boost/Default/install


+ 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)/host/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)/host/share/vala-0.30/vapi
endef endef
define Package/libgee/install define Package/libgee/install


+ 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)/host/bin/node \
-DSWIG_DIR=$(STAGING_DIR)/host/bin
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/node TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/node


+ 2
- 2
libs/libsearpc/Makefile View File

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


+ 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)/host/bin/node \
-DSWIG_DIR=$(STAGING_DIR)/host/bin
define Package/libupm/Default define Package/libupm/Default
SECTION:=libs SECTION:=libs


+ 2
- 2
libs/libzdb/Makefile View File

@ -67,8 +67,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)/host/bin
$(CP) $(HOST_BUILD_DIR)/tools/bin/filterh $(STAGING_DIR)/host/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)/host/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

+ 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)/host/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)/host/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)/host/share/vala-0.30/vapi
endef endef
define Package/grilo/install define Package/grilo/install


+ 4
- 3
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)/host/bin/rpcgen \
RPCGEN=$(STAGING_DIR)/host/bin/rpcgen
HOST_CFLAGS += -Dlinux HOST_CFLAGS += -Dlinux
@ -125,7 +125,8 @@ define Host/Compile
endef endef
define Host/Install define Host/Install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/rpcgen/rpcgen $(STAGING_DIR_HOST)/bin/rpcgen
$(INSTALL_DIR) $(STAGING_DIR)/host/bin
$(INSTALL_BIN) $(HOST_BUILD_DIR)/tools/rpcgen/rpcgen $(STAGING_DIR)/host/bin/rpcgen
endef endef
define Package/nfs-kernel-server/install define Package/nfs-kernel-server/install


+ 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="$(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" \
--without-x \ --without-x \
--libexecdir="$(STAGING_DIR_HOST)/lib/dbus-1"
--libexecdir="$(STAGING_DIR)/host/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