jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-24 19:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Globally replace $(HOST_DIR)/usr/lib with $(HOST_DIR)/lib

Browse Source 
Since things are no longer installed in $(HOST_DIR)/usr, the callers
should also not refer to it.

This is a mechanical change with
git grep -l '$(HOST_DIR)/usr/lib' | xargs sed -i 's%$(HOST_DIR)/usr/lib%$(HOST_DIR)/lib%g'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Arnout Vandecappelle 2017-07-05 13:14:21 +02:00 committed by Thomas Petazzoni
parent 1eb57df2b2
commit 19ba17ee3b
28 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot/grub2/grub2.mk
View File

@ -79,7 +79,7 @@ GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install
ifeq ($(BR2_TARGET_GRUB2_I386_PC),y) ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
define GRUB2_IMAGE_INSTALL_ELTORITO define GRUB2_IMAGE_INSTALL_ELTORITO
cat $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/cdboot.img $(GRUB2_IMAGE) > \ cat $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE)/cdboot.img $(GRUB2_IMAGE) > \
$(BINARIES_DIR)/grub-eltorito.img $(BINARIES_DIR)/grub-eltorito.img
endef endef
endif endif
@ -87,7 +87,7 @@ endif
define GRUB2_IMAGE_INSTALLATION define GRUB2_IMAGE_INSTALLATION
mkdir -p $(dir $(GRUB2_IMAGE)) mkdir -p $(dir $(GRUB2_IMAGE))
$(HOST_DIR)/bin/grub-mkimage \ $(HOST_DIR)/bin/grub-mkimage \
-d $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE) \ -d $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE) \
-O $(GRUB2_TUPLE) \ -O $(GRUB2_TUPLE) \
-o $(GRUB2_IMAGE) \ -o $(GRUB2_IMAGE) \
-p "$(GRUB2_PREFIX)" \ -p "$(GRUB2_PREFIX)" \

4
package/4th/4th.mk
View File

@ -60,10 +60,10 @@ endef
define HOST_4TH_INSTALL_CMDS define HOST_4TH_INSTALL_CMDS
mkdir -p $(HOST_DIR)/bin mkdir -p $(HOST_DIR)/bin
mkdir -p $(HOST_DIR)/usr/lib mkdir -p $(HOST_DIR)/lib
$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \
BINARIES=$(HOST_DIR)/bin \ BINARIES=$(HOST_DIR)/bin \
LIBRARIES=$(HOST_DIR)/usr/lib LIBRARIES=$(HOST_DIR)/lib
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

6
package/Makefile.in
View File

@ -229,9 +229,9 @@ HOST_LDFLAGS += -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib
export PERL=$(shell which perl) export PERL=$(shell which perl)
# host-intltool needs libxml-parser-perl, which Buildroot installs in # host-intltool needs libxml-parser-perl, which Buildroot installs in
# $(HOST_DIR)/usr/lib/perl, so we must make sure that the system perl # $(HOST_DIR)/lib/perl, so we must make sure that the system perl
# finds this perl module by exporting the proper value for PERL5LIB. # finds this perl module by exporting the proper value for PERL5LIB.
export PERL5LIB=$(HOST_DIR)/usr/lib/perl export PERL5LIB=$(HOST_DIR)/lib/perl
TARGET_MAKE_ENV = PATH=$(BR_PATH) TARGET_MAKE_ENV = PATH=$(BR_PATH)
@ -282,7 +282,7 @@ HOST_MAKE_ENV = \
PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_SYSROOT_DIR="/" \
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig"
HOST_CONFIGURE_OPTS = \ HOST_CONFIGURE_OPTS = \
$(HOST_MAKE_ENV) \ $(HOST_MAKE_ENV) \

2
package/acl/acl.mk
View File

@ -49,7 +49,7 @@ HOST_ACL_MAKE_ENV = CFLAGS="$(HOST_CFLAGS)"
HOST_ACL_INSTALL_OPTS = \ HOST_ACL_INSTALL_OPTS = \
prefix=$(HOST_DIR) \ prefix=$(HOST_DIR) \
exec_prefix=$(HOST_DIR) \ exec_prefix=$(HOST_DIR) \
PKG_DEVLIB_DIR=$(HOST_DIR)/usr/lib \ PKG_DEVLIB_DIR=$(HOST_DIR)/lib \
install-dev install-lib install-dev install-lib
# For the host, libacl.la is correct, no fixup needed. # For the host, libacl.la is correct, no fixup needed.

2
package/efl/efl.mk
View File

@ -388,7 +388,7 @@ endif
# system bus which is non-existent and does not contain # system bus which is non-existent and does not contain
# any upower service in it. # any upower service in it.
define HOST_EFL_HOOK_REMOVE_UPOWER define HOST_EFL_HOOK_REMOVE_UPOWER
rm -fr $(HOST_DIR)/usr/lib/ecore/system/upower rm -fr $(HOST_DIR)/lib/ecore/system/upower
endef endef
HOST_EFL_POST_INSTALL_HOOKS = HOST_EFL_HOOK_REMOVE_UPOWER HOST_EFL_POST_INSTALL_HOOKS = HOST_EFL_HOOK_REMOVE_UPOWER

2
package/ejabberd/ejabberd.mk
View File

@ -28,7 +28,7 @@ EJABBERD_ERLANG_LIBS = sasl crypto public_key ssl mnesia inets compiler
# Guess answers for these tests, configure will bail out otherwise # Guess answers for these tests, configure will bail out otherwise
# saying error: cannot run test program while cross compiling. # saying error: cannot run test program while cross compiling.
EJABBERD_CONF_ENV = \ EJABBERD_CONF_ENV = \
ac_cv_erlang_root_dir="$(HOST_DIR)/usr/lib/erlang" \ ac_cv_erlang_root_dir="$(HOST_DIR)/lib/erlang" \
$(foreach lib,$(EJABBERD_ERLANG_LIBS), \ $(foreach lib,$(EJABBERD_ERLANG_LIBS), \
ac_cv_erlang_lib_dir_$(lib)="`package/ejabberd/check-erlang-lib $(lib)`") ac_cv_erlang_lib_dir_$(lib)="`package/ejabberd/check-erlang-lib $(lib)`")

4
package/execline/execline.mk
View File

@ -47,9 +47,9 @@ HOST_EXECLINE_DEPENDENCIES = host-skalibs
HOST_EXECLINE_CONF_OPTS = \ HOST_EXECLINE_CONF_OPTS = \
--prefix=$(HOST_DIR) \ --prefix=$(HOST_DIR) \
--shebangdir=/usr/bin \ --shebangdir=/usr/bin \
--with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \ --with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \ --with-include=$(HOST_DIR)/usr/include \
--with-dynlib=$(HOST_DIR)/usr/lib \ --with-dynlib=$(HOST_DIR)/lib \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
--disable-allstatic --disable-allstatic

4
package/gdk-pixbuf/gdk-pixbuf.mk
View File

@ -58,7 +58,7 @@ endif
# need to sanitize (strip) them. # need to sanitize (strip) them.
ifeq ($(BR2_STATIC_LIBS),) ifeq ($(BR2_STATIC_LIBS),)
define GDK_PIXBUF_UPDATE_CACHE define GDK_PIXBUF_UPDATE_CACHE
GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders \ GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \
$(HOST_DIR)/bin/gdk-pixbuf-query-loaders \ $(HOST_DIR)/bin/gdk-pixbuf-query-loaders \
> $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
$(SED) "s,$(HOST_DIR),,g" \ $(SED) "s,$(HOST_DIR),,g" \
@ -77,7 +77,7 @@ GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS
# thumbnailer. Use the host-built since it matches the target options # thumbnailer. Use the host-built since it matches the target options
# regarding mime types (which is the used information). # regarding mime types (which is the used information).
define GDK_PIXBUF_COPY_LOADERS_CACHE define GDK_PIXBUF_COPY_LOADERS_CACHE
cp -f $(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ cp -f $(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
$(@D)/gdk-pixbuf $(@D)/gdk-pixbuf
endef endef
GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE

2
package/go-bootstrap/go-bootstrap.mk
View File

@ -17,7 +17,7 @@ GO_BOOTSTRAP_LICENSE_FILES = LICENSE
# host-go-bootstrap. # host-go-bootstrap.
HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain
HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/usr/lib/go-$(GO_BOOTSTRAP_VERSION) HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION)
# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE # The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE
# here. See https://github.com/golang/go/issues/11685. # here. See https://github.com/golang/go/issues/11685.

2
package/go/go.mk
View File

@ -37,7 +37,7 @@ GO_GOARCH = mips64le
endif endif
HOST_GO_DEPENDENCIES = host-go-bootstrap HOST_GO_DEPENDENCIES = host-go-bootstrap
HOST_GO_ROOT = $(HOST_DIR)/usr/lib/go HOST_GO_ROOT = $(HOST_DIR)/lib/go
# For the convienience of target packages. # For the convienience of target packages.
HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH)

2
package/gtest/gtest.mk
View File

@ -26,7 +26,7 @@ HOST_GTEST_DEPENDENCIES += host-python
endif endif
HOST_GTEST_GMOCK_PYTHONPATH = \ HOST_GTEST_GMOCK_PYTHONPATH = \
$(HOST_DIR)/usr/lib/python$(HOST_GTEST_PYTHON_VERSION)/site-packages $(HOST_DIR)/lib/python$(HOST_GTEST_PYTHON_VERSION)/site-packages
# While it is possible to build gtest as shared library, using this gtest shared # While it is possible to build gtest as shared library, using this gtest shared
# library requires to set some special configure option in the project using # library requires to set some special configure option in the project using

4
package/heimdal/heimdal.mk
View File

@ -30,10 +30,10 @@ HEIMDAL_LICENSE_FILES = LICENSE
# We need asn1_compile in the PATH for samba4 # We need asn1_compile in the PATH for samba4
define HOST_HEIMDAL_MAKE_SYMLINK define HOST_HEIMDAL_MAKE_SYMLINK
ln -sf $(HOST_DIR)/usr/libexec/heimdal/asn1_compile \ ln -sf $(HOST_DIR)/libexec/heimdal/asn1_compile \
$(HOST_DIR)/bin/asn1_compile $(HOST_DIR)/bin/asn1_compile
ln -sf $(HOST_DIR)/bin/compile_et \ ln -sf $(HOST_DIR)/bin/compile_et \
$(HOST_DIR)/usr/libexec/heimdal/compile_et $(HOST_DIR)/libexec/heimdal/compile_et
endef endef
HOST_HEIMDAL_POST_INSTALL_HOOKS += HOST_HEIMDAL_MAKE_SYMLINK HOST_HEIMDAL_POST_INSTALL_HOOKS += HOST_HEIMDAL_MAKE_SYMLINK

2
package/leafnode2/leafnode2.mk
View File

@ -31,7 +31,7 @@ define LEAFNODE2_BUILD_SORTNL_TOOL
$(HOSTCC) $(HOST_CFLAGS) -o b_sortnl_host \ $(HOSTCC) $(HOST_CFLAGS) -o b_sortnl_host \
arc4random.c mergesort.c b_sortnl.c critmem_malloc.c \ arc4random.c mergesort.c b_sortnl.c critmem_malloc.c \
critmem_realloc.c -DHAVE_CONFIG_H -I$(HOST_DIR)/usr/include \ critmem_realloc.c -DHAVE_CONFIG_H -I$(HOST_DIR)/usr/include \
-L $(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib -lpcre -L $(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib -lpcre
endef endef
LEAFNODE2_PRE_BUILD_HOOKS += LEAFNODE2_BUILD_SORTNL_TOOL LEAFNODE2_PRE_BUILD_HOOKS += LEAFNODE2_BUILD_SORTNL_TOOL

8
package/libselinux/libselinux.mk
View File

@ -89,7 +89,7 @@ HOST_LIBSELINUX_MAKE_OPTS = \
$(HOST_CONFIGURE_OPTS) \ $(HOST_CONFIGURE_OPTS) \
LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \
PYINC="$(HOST_LIBSELINUX_PYINC)" \ PYINC="$(HOST_LIBSELINUX_PYINC)" \
PYSITEDIR="$(HOST_DIR)/usr/lib/$(HOST_LIBSELINUX_PYLIBVER)/site-packages" \ PYSITEDIR="$(HOST_DIR)/lib/$(HOST_LIBSELINUX_PYLIBVER)/site-packages" \
SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/" SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/"
define HOST_LIBSELINUX_BUILD_CMDS define HOST_LIBSELINUX_BUILD_CMDS
@ -97,7 +97,7 @@ define HOST_LIBSELINUX_BUILD_CMDS
# header paths. # header paths.
$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \
$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \
SHLIBDIR=$(HOST_DIR)/usr/lib all SHLIBDIR=$(HOST_DIR)/lib all
# Generate python interface wrapper # Generate python interface wrapper
$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \
$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap
@ -106,8 +106,8 @@ endef
define HOST_LIBSELINUX_INSTALL_CMDS define HOST_LIBSELINUX_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \
SHLIBDIR=$(HOST_DIR)/usr/lib SBINDIR=$(HOST_DIR)/sbin install SHLIBDIR=$(HOST_DIR)/lib SBINDIR=$(HOST_DIR)/sbin install
(cd $(HOST_DIR)/usr/lib; $(HOSTLN) -sf libselinux.so.1 libselinux.so) (cd $(HOST_DIR)/lib; $(HOSTLN) -sf libselinux.so.1 libselinux.so)
# Install python interface wrapper # Install python interface wrapper
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap

4
package/libsemanage/libsemanage.mk
View File

@ -36,13 +36,13 @@ ifeq ($(BR2_PACKAGE_PYTHON3),y)
HOST_LIBSEMANAGE_DEPENDENCIES += host-python3 HOST_LIBSEMANAGE_DEPENDENCIES += host-python3
HOST_LIBSEMANAGE_MAKE_OPTS += \ HOST_LIBSEMANAGE_MAKE_OPTS += \
PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/" \ PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/" \
PYTHONLIBDIR="-L$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/" \ PYTHONLIBDIR="-L$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/" \
PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" PYLIBVER="python$(PYTHON3_VERSION_MAJOR)"
else else
HOST_LIBSEMANAGE_DEPENDENCIES += host-python HOST_LIBSEMANAGE_DEPENDENCIES += host-python
HOST_LIBSEMANAGE_MAKE_OPTS += \ HOST_LIBSEMANAGE_MAKE_OPTS += \
PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \ PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \
PYTHONLIBDIR="-L$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/" \ PYTHONLIBDIR="-L$(HOST_DIR)/lib/python$(PYTHON_VERSION_MAJOR)/" \
PYLIBVER="python$(PYTHON_VERSION_MAJOR)" PYLIBVER="python$(PYTHON_VERSION_MAJOR)"
endif endif

2
package/libsepol/libsepol.mk
View File

@ -44,7 +44,7 @@ endef
define HOST_LIBSEPOL_INSTALL_CMDS define HOST_LIBSEPOL_INSTALL_CMDS
$(HOST_LIBSEPOL_MAKE_ENV) $(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS) $(HOST_LIBSEPOL_MAKE_ENV) $(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS)
ln -sf libsepol.so.1 $(HOST_DIR)/usr/lib/libsepol.so ln -sf libsepol.so.1 $(HOST_DIR)/lib/libsepol.so
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

6
package/libxml-parser-perl/libxml-parser-perl.mk
View File

@ -15,11 +15,11 @@ define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
(cd $(@D) ; \ (cd $(@D) ; \
$(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \ $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
PREFIX=$(HOST_DIR) \ PREFIX=$(HOST_DIR) \
EXPATLIBPATH=$(HOST_DIR)/usr/lib \ EXPATLIBPATH=$(HOST_DIR)/lib \
EXPATINCPATH=$(HOST_DIR)/usr/include \ EXPATINCPATH=$(HOST_DIR)/usr/include \
INSTALLDIRS=site \ INSTALLDIRS=site \
INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \ INSTALLSITELIB=$(HOST_DIR)/lib/perl \
INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \ INSTALLSITEARCH=$(HOST_DIR)/lib/perl \
) )
endef endef

2
package/lua/lua.mk
View File

@ -97,7 +97,7 @@ endef
define HOST_LUA_INSTALL_CMDS define HOST_LUA_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install $(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
$(HOST_DIR)/usr/lib/pkgconfig/lua.pc $(HOST_DIR)/lib/pkgconfig/lua.pc
endef endef
$(eval $(generic-package)) $(eval $(generic-package))

2
package/mfgtools/mfgtools.mk
View File

@ -26,7 +26,7 @@ HOST_MFGTOOLS_POST_BUILD_HOOKS += HOST_MFGTOOLS_CLI_BUILD
define HOST_MFGTOOLS_INSTALL_CMDS define HOST_MFGTOOLS_INSTALL_CMDS
$(INSTALL) -D -m 755 $(@D)/MfgToolLib/libMfgToolLib.so \ $(INSTALL) -D -m 755 $(@D)/MfgToolLib/libMfgToolLib.so \
$(HOST_DIR)/usr/lib/libMfgToolLib.so $(HOST_DIR)/lib/libMfgToolLib.so
$(INSTALL) -D -m 755 $(@D)/TestPrgm/mfgtoolcli \ $(INSTALL) -D -m 755 $(@D)/TestPrgm/mfgtoolcli \
$(HOST_DIR)/bin/mfgtoolcli $(HOST_DIR)/bin/mfgtoolcli
endef endef

4
package/mono/mono.mk
View File

@ -29,7 +29,7 @@ MONO_CONF_OPTS = --with-mcs-docs=no \
# architecture-independent, we simply copy them to the target. # architecture-independent, we simply copy them to the target.
define MONO_INSTALL_LIBS define MONO_INSTALL_LIBS
rsync -av --exclude=*.so --exclude=*.mdb \ rsync -av --exclude=*.so --exclude=*.mdb \
$(HOST_DIR)/usr/lib/mono $(TARGET_DIR)/usr/lib/ $(HOST_DIR)/lib/mono $(TARGET_DIR)/usr/lib/
endef endef
MONO_POST_INSTALL_TARGET_HOOKS += MONO_INSTALL_LIBS MONO_POST_INSTALL_TARGET_HOOKS += MONO_INSTALL_LIBS
@ -56,7 +56,7 @@ HOST_MONO_DEPENDENCIES = host-monolite host-gettext
define HOST_MONO_SETUP_MONOLITE define HOST_MONO_SETUP_MONOLITE
rm -rf $(@D)/mcs/class/lib/monolite rm -rf $(@D)/mcs/class/lib/monolite
(cd $(@D)/mcs/class/lib; ln -s $(HOST_DIR)/usr/lib/monolite monolite) (cd $(@D)/mcs/class/lib; ln -s $(HOST_DIR)/lib/monolite monolite)
endef endef
HOST_MONO_POST_CONFIGURE_HOOKS += HOST_MONO_SETUP_MONOLITE HOST_MONO_POST_CONFIGURE_HOOKS += HOST_MONO_SETUP_MONOLITE

4
package/monolite/monolite.mk
View File

@ -10,8 +10,8 @@ MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz
MONOLITE_LICENSE = LGPL-2.0 or commercial MONOLITE_LICENSE = LGPL-2.0 or commercial
define HOST_MONOLITE_INSTALL_CMDS define HOST_MONOLITE_INSTALL_CMDS
mkdir -p $(HOST_DIR)/usr/lib/monolite mkdir -p $(HOST_DIR)/lib/monolite
cp $(@D)/* $(HOST_DIR)/usr/lib/monolite cp $(@D)/* $(HOST_DIR)/lib/monolite
endef endef
$(eval $(host-generic-package)) $(eval $(host-generic-package))

2
package/owfs/owfs.mk
View File

@ -68,7 +68,7 @@ OWFS_MAKE_ENV += \
OWFS_DEPENDENCIES += python host-swig OWFS_DEPENDENCIES += python host-swig
# The configure scripts finds PYSITEDIR as the python_lib directory of # The configure scripts finds PYSITEDIR as the python_lib directory of
# host-python, and then prepends DESTDIR in front of it. So we end up # host-python, and then prepends DESTDIR in front of it. So we end up
# installing things in $(TARGET_DIR)/$(HOST_DIR)/usr/lib/python which is # installing things in $(TARGET_DIR)/$(HOST_DIR)/lib/python which is
# clearly wrong. # clearly wrong.
# Patching owfs to do the right thing is not trivial, it's much easier to # Patching owfs to do the right thing is not trivial, it's much easier to
# override the PYSITEDIR variable in make. # override the PYSITEDIR variable in make.

4
package/pseudo/pseudo.mk
View File

@ -21,9 +21,9 @@ HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite
# a warning at configure time. # a warning at configure time.
HOST_PSEUDO_CONF_OPTS = \ HOST_PSEUDO_CONF_OPTS = \
--cflags="$(HOSTCFLAGS)" \ --cflags="$(HOSTCFLAGS)" \
--with-rpath=$(HOST_DIR)/usr/lib \ --with-rpath=$(HOST_DIR)/lib \
--bits=$(if $(filter %64,$(HOSTARCH)),64,32) \ --bits=$(if $(filter %64,$(HOSTARCH)),64,32) \
--libdir=$(HOST_DIR)/usr/lib \ --libdir=$(HOST_DIR)/lib \
--with-sqlite=$(HOST_DIR)/usr --with-sqlite=$(HOST_DIR)/usr
$(eval $(host-autotools-package)) $(eval $(host-autotools-package))

2
package/python-cffi/python-cffi.mk
View File

@ -20,7 +20,7 @@ HOST_PYTHON_CFFI_ENV = \
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_SYSROOT_DIR="/" \ PKG_CONFIG_SYSROOT_DIR="/" \
PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig"
HOST_PYTHON_CFFI_DEPENDENCIES = host-pkgconf host-python-pycparser host-libffi HOST_PYTHON_CFFI_DEPENDENCIES = host-pkgconf host-python-pycparser host-libffi
$(eval $(python-package)) $(eval $(python-package))

4
package/s6-rc/s6-rc.mk
View File

@ -49,9 +49,9 @@ HOST_S6_RC_DEPENDENCIES = host-s6
HOST_S6_RC_CONF_OPTS = \ HOST_S6_RC_CONF_OPTS = \
--prefix=$(HOST_DIR) \ --prefix=$(HOST_DIR) \
--libexecdir=/usr/libexec \ --libexecdir=/usr/libexec \
--with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \ --with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \ --with-include=$(HOST_DIR)/usr/include \
--with-dynlib=$(HOST_DIR)/usr/lib \ --with-dynlib=$(HOST_DIR)/lib \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
--disable-allstatic --disable-allstatic

4
package/s6/s6.mk
View File

@ -47,9 +47,9 @@ HOST_S6_DEPENDENCIES = host-execline
HOST_S6_CONF_OPTS = \ HOST_S6_CONF_OPTS = \
--prefix=$(HOST_DIR) \ --prefix=$(HOST_DIR) \
--with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \ --with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \ --with-include=$(HOST_DIR)/usr/include \
--with-dynlib=$(HOST_DIR)/usr/lib \ --with-dynlib=$(HOST_DIR)/lib \
--disable-static \ --disable-static \
--enable-shared \ --enable-shared \
--disable-allstatic --disable-allstatic

2
package/scons/scons.mk
View File

@ -13,7 +13,7 @@ SCONS_SETUP_TYPE = distutils
HOST_SCONS_NEEDS_HOST_PYTHON = python2 HOST_SCONS_NEEDS_HOST_PYTHON = python2
HOST_SCONS_INSTALL_OPTS = \ HOST_SCONS_INSTALL_OPTS = \
--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION) --install-lib=$(HOST_DIR)/lib/scons-$(SCONS_VERSION)
$(eval $(host-python-package)) $(eval $(host-python-package))

4
package/setools/setools.mk
View File

@ -48,7 +48,7 @@ HOST_SETOOLS_DEPENDENCIES += host-python
HOST_SETOOLS_CONF_ENV += am_cv_python_version=$(PYTHON_VERSION) HOST_SETOOLS_CONF_ENV += am_cv_python_version=$(PYTHON_VERSION)
endif endif
HOST_SETOOLS_PYTHON_SITE_PACKAGES = $(HOST_DIR)/usr/lib/python$(HOST_SETOOLS_PYTHON_VERSION)/site-packages HOST_SETOOLS_PYTHON_SITE_PACKAGES = $(HOST_DIR)/lib/python$(HOST_SETOOLS_PYTHON_VERSION)/site-packages
HOST_SETOOLS_PYTHON_INCLUDES = $(HOST_DIR)/usr/include/python$(HOST_SETOOLS_PYTHON_VERSION) HOST_SETOOLS_PYTHON_INCLUDES = $(HOST_DIR)/usr/include/python$(HOST_SETOOLS_PYTHON_VERSION)
HOST_SETOOLS_PYTHON_LIB = -lpython$(HOST_SETOOLS_PYTHON_VERSION) HOST_SETOOLS_PYTHON_LIB = -lpython$(HOST_SETOOLS_PYTHON_VERSION)
@ -66,7 +66,7 @@ HOST_SETOOLS_CONF_OPTS = \
--disable-swig-tcl \ --disable-swig-tcl \
--with-sepol-devel="$(HOST_DIR)/usr" \ --with-sepol-devel="$(HOST_DIR)/usr" \
--with-selinux-devel="$(HOST_DIR)/usr" \ --with-selinux-devel="$(HOST_DIR)/usr" \
PYTHON_LDFLAGS="-L$(HOST_DIR)/usr/lib/" \ PYTHON_LDFLAGS="-L$(HOST_DIR)/lib/" \
PYTHON_CPPFLAGS="-I$(HOST_SETOOLS_PYTHON_INCLUDES)" \ PYTHON_CPPFLAGS="-I$(HOST_SETOOLS_PYTHON_INCLUDES)" \
PYTHON_SITE_PKG="$(HOST_SETOOLS_PYTHON_SITE_PACKAGES)" \ PYTHON_SITE_PKG="$(HOST_SETOOLS_PYTHON_SITE_PACKAGES)" \
PYTHON_EXTRA_LIBS="-lpthread -ldl -lutil $(HOST_SETOOLS_PYTHON_LIB)" PYTHON_EXTRA_LIBS="-lpthread -ldl -lutil $(HOST_SETOOLS_PYTHON_LIB)"