generic packages: use $(HOST_DIR) instead of $(HOST_DIR)/usr as prefix

Remove the redundant usr/ component of the HOST_DIR paths. Since a
previous commit added a symlink from $(HOST_DIR)/usr to $(HOST_DIR),
everything keeps on working.

This is a mechanical change with
git grep -l '\$(HOST_DIR)/usr' | xargs sed -i 's%\(prefix\|PREFIX\)=\("\?\)\$(HOST_DIR)/usr%\1=\2$(HOST_DIR)%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:18 +02:00 committed by Thomas Petazzoni
parent 632b6f1477
commit 15bff58f3e
29 changed files with 39 additions and 39 deletions

View File

@ -47,8 +47,8 @@ HOST_ACL_DEPENDENCIES = host-attr
HOST_ACL_CONF_OPTS = --enable-gettext=no
HOST_ACL_MAKE_ENV = CFLAGS="$(HOST_CFLAGS)"
HOST_ACL_INSTALL_OPTS = \
prefix=$(HOST_DIR)/usr \
exec_prefix=$(HOST_DIR)/usr \
prefix=$(HOST_DIR) \
exec_prefix=$(HOST_DIR) \
PKG_DEVLIB_DIR=$(HOST_DIR)/usr/lib \
install-dev install-lib
# For the host, libacl.la is correct, no fixup needed.

View File

@ -30,7 +30,7 @@ endef
define HOST_ACPICA_INSTALL_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
PREFIX="$(HOST_DIR)/usr" \
PREFIX="$(HOST_DIR)" \
INSTALLFLAGS=-m755 install
endef

View File

@ -28,8 +28,8 @@ ATTR_INSTALL_TARGET_OPTS = \
install install-lib
HOST_ATTR_INSTALL_OPTS = \
prefix=$(HOST_DIR)/usr \
exec_prefix=$(HOST_DIR)/usr \
prefix=$(HOST_DIR) \
exec_prefix=$(HOST_DIR) \
install-dev install-lib
# The libdir variable in libattr.la is empty, so let's fix it. This is

View File

@ -167,14 +167,14 @@ define HOST_BOOST_BUILD_CMDS
--user-config=$(@D)/user-config.jam \
$(HOST_BOOST_OPTS) \
--ignore-site-config \
--prefix=$(HOST_DIR)/usr )
--prefix=$(HOST_DIR) )
endef
define HOST_BOOST_INSTALL_CMDS
(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \
--user-config=$(@D)/user-config.jam \
$(HOST_BOOST_OPTS) \
--prefix=$(HOST_DIR)/usr \
--prefix=$(HOST_DIR) \
--ignore-site-config \
--layout=$(BOOST_LAYOUT) install )
endef

View File

@ -60,9 +60,9 @@ endef
define HOST_BZIP2_INSTALL_CMDS
$(HOST_MAKE_ENV) \
$(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
$(MAKE) PREFIX=$(HOST_DIR) -C $(@D) install
$(HOST_MAKE_ENV) \
$(MAKE) -f Makefile-libbz2_so PREFIX=$(HOST_DIR)/usr -C $(@D) install
$(MAKE) -f Makefile-libbz2_so PREFIX=$(HOST_DIR) -C $(@D) install
endef
$(eval $(generic-package))

View File

@ -41,7 +41,7 @@ define HOST_CMAKE_CONFIGURE_CMDS
(cd $(@D); \
$(HOST_CONFIGURE_OPTS) \
CFLAGS="$(HOST_CMAKE_CFLAGS)" \
./bootstrap --prefix=$(HOST_DIR)/usr \
./bootstrap --prefix=$(HOST_DIR) \
--parallel=$(PARALLEL_JOBS) -- \
-DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \
-DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \

View File

@ -24,7 +24,7 @@ define HOST_CRYPTOPP_BUILD_CMDS
endef
define HOST_CRYPTOPP_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
endef
$(eval $(host-generic-package))

View File

@ -47,11 +47,11 @@ endef
# host build
define HOST_DTC_BUILD_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE) CFLAGS="$(HOST_CFLAGS) -fPIC" -C $(@D) PREFIX=$(HOST_DIR)/usr
$(HOST_CONFIGURE_OPTS) $(MAKE) CFLAGS="$(HOST_CFLAGS) -fPIC" -C $(@D) PREFIX=$(HOST_DIR)
endef
define HOST_DTC_INSTALL_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install-bin
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-bin
endef
$(eval $(generic-package))

View File

@ -45,7 +45,7 @@ endef
HOST_EXECLINE_DEPENDENCIES = host-skalibs
HOST_EXECLINE_CONF_OPTS = \
--prefix=$(HOST_DIR)/usr \
--prefix=$(HOST_DIR) \
--shebangdir=/usr/bin \
--with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \

View File

@ -10,11 +10,11 @@ FAKETIME_LICENSE = GPL-2.0
FAKETIME_LICENSE_FILES = COPYING
define HOST_FAKETIME_BUILD_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)
endef
define HOST_FAKETIME_INSTALL_CMDS
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
endef
$(eval $(host-generic-package))

View File

@ -43,7 +43,7 @@ define HOST_GCC_FINAL_CONFIGURE_CMDS
LDFLAGS="$(HOST_LDFLAGS)" \
$(HOST_GCC_FINAL_CONF_ENV) \
./configure \
--prefix="$(HOST_DIR)/usr" \
--prefix="$(HOST_DIR)" \
--sysconfdir="$(HOST_DIR)/etc" \
--enable-static \
$(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \

View File

@ -63,7 +63,7 @@ KODI_CONF_OPTS += \
-DENABLE_INTERNAL_FFMPEG=OFF \
-DKODI_DEPENDSBUILD=OFF \
-DENABLE_OPENSSL=ON \
-DNATIVEPREFIX=$(HOST_DIR)/usr \
-DNATIVEPREFIX=$(HOST_DIR) \
-DDEPENDS_PATH=$(@D) \
-DWITH_TEXTUREPACKER=$(HOST_DIR)/usr/bin/TexturePacker \
-DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \

View File

@ -36,7 +36,7 @@ endef
HOST_LIBSEPOL_MAKE_ENV = \
$(HOST_MAKE_ENV) \
DESTDIR=$(HOST_DIR)/usr \
PREFIX=$(HOST_DIR)/usr
PREFIX=$(HOST_DIR)
define HOST_LIBSEPOL_BUILD_CMDS
$(HOST_LIBSEPOL_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS)

View File

@ -14,7 +14,7 @@ LIBXML_PARSER_PERL_RUN_PERL = `which perl`
define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
(cd $(@D) ; \
$(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
PREFIX=$(HOST_DIR)/usr \
PREFIX=$(HOST_DIR) \
EXPATLIBPATH=$(HOST_DIR)/usr/lib \
EXPATINCPATH=$(HOST_DIR)/usr/include \
INSTALLDIRS=site \

View File

@ -66,13 +66,13 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK
# host-efl package needs host-luajit to be linked dynamically.
define HOST_LUAJIT_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" BUILDMODE=dynamic \
$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" BUILDMODE=dynamic \
TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
-C $(@D) amalg
endef
define HOST_LUAJIT_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" LDCONFIG=true -C $(@D) install
$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" LDCONFIG=true -C $(@D) install
endef
$(eval $(generic-package))

View File

@ -19,7 +19,7 @@ LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2
endif
HOST_LUAROCKS_CONF_OPTS = \
--prefix=$(HOST_DIR)/usr \
--prefix=$(HOST_DIR) \
--sysconfdir=$(LUAROCKS_CONFIG_DIR) \
--with-lua=$(HOST_DIR)/usr
@ -34,7 +34,7 @@ endef
define HOST_LUAROCKS_INSTALL_CMDS
rm -f $(LUAROCKS_CONFIG_FILE)
$(MAKE1) -C $(@D) install \
PREFIX=$(HOST_DIR)/usr
PREFIX=$(HOST_DIR)
echo "-- BR cross-compilation" >> $(LUAROCKS_CONFIG_FILE)
echo "variables = {" >> $(LUAROCKS_CONFIG_FILE)
echo " LUA_INCDIR = [[$(STAGING_DIR)/usr/include]]," >> $(LUAROCKS_CONFIG_FILE)

View File

@ -22,7 +22,7 @@ define HOST_LZ4_BUILD_CMDS
endef
define HOST_LZ4_INSTALL_CMDS
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX=$(HOST_DIR)/usr \
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX=$(HOST_DIR) \
install -C $(@D)
endef

View File

@ -55,7 +55,7 @@ define HOST_NODEJS_CONFIGURE_CMDS
PATH=$(@D)/bin:$(BR_PATH) \
PYTHON=$(HOST_DIR)/usr/bin/python2 \
$(HOST_DIR)/usr/bin/python2 ./configure \
--prefix=$(HOST_DIR)/usr \
--prefix=$(HOST_DIR) \
--without-snapshot \
--without-dtrace \
--without-etw \

View File

@ -61,7 +61,7 @@ define HOST_OPENSSL_CONFIGURE_CMDS
(cd $(@D); \
$(HOST_CONFIGURE_OPTS) \
./config \
--prefix=$(HOST_DIR)/usr \
--prefix=$(HOST_DIR) \
--openssldir=$(HOST_DIR)/etc/ssl \
--libdir=/lib \
shared \

View File

@ -91,7 +91,7 @@ endef
HOST_PERL_CONF_OPTS = \
-des \
-Dprefix="$(HOST_DIR)/usr" \
-Dprefix="$(HOST_DIR)" \
-Dcc="$(HOSTCC)"
define HOST_PERL_CONFIGURE_CMDS

View File

@ -37,7 +37,7 @@ define HOST_PNGQUANT_CONFIGURE_CMDS
(cd $(@D) && \
$(HOST_CONFIGURE_OPTS) \
CC=$(HOSTCC_NOCCACHE) \
./configure --prefix=$(HOST_DIR)/usr \
./configure --prefix=$(HOST_DIR) \
--without-lcms2 \
)
endef

View File

@ -126,7 +126,7 @@ define HOST_QEMU_CONFIGURE_CMDS
cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \
./configure \
--target-list="$(HOST_QEMU_TARGETS)" \
--prefix="$(HOST_DIR)/usr" \
--prefix="$(HOST_DIR)" \
--interp-prefix=$(STAGING_DIR) \
--cc="$(HOSTCC)" \
--host-cc="$(HOSTCC)" \

View File

@ -47,7 +47,7 @@ endef
HOST_S6_RC_DEPENDENCIES = host-s6
HOST_S6_RC_CONF_OPTS = \
--prefix=$(HOST_DIR)/usr \
--prefix=$(HOST_DIR) \
--libexecdir=/usr/libexec \
--with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \

View File

@ -46,7 +46,7 @@ endef
HOST_S6_DEPENDENCIES = host-execline
HOST_S6_CONF_OPTS = \
--prefix=$(HOST_DIR)/usr \
--prefix=$(HOST_DIR) \
--with-sysdeps=$(HOST_DIR)/usr/lib/skalibs/sysdeps \
--with-include=$(HOST_DIR)/usr/include \
--with-dynlib=$(HOST_DIR)/usr/lib \

View File

@ -37,8 +37,8 @@ SDL_IMAGE_DEPENDENCIES = sdl \
$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
HOST_SDL_IMAGE_CONF_OPTS = \
--with-sdl-prefix=$(HOST_DIR)/usr \
--with-sdl-exec-prefix=$(HOST_DIR)/usr \
--with-sdl-prefix=$(HOST_DIR) \
--with-sdl-exec-prefix=$(HOST_DIR) \
--disable-sdltest \
--disable-static \
--disable-jpg-shared \

View File

@ -33,7 +33,7 @@ define SKALIBS_INSTALL_STAGING_CMDS
endef
HOST_SKALIBS_CONF_OPTS = \
--prefix=$(HOST_DIR)/usr \
--prefix=$(HOST_DIR) \
--disable-static \
--enable-shared \
--disable-allstatic

View File

@ -12,13 +12,13 @@ HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf
FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin
define HOST_SUNXI_TOOLS_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR)/usr \
$(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR) \
EXTRA_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
-C $(@D) tools
endef
define HOST_SUNXI_TOOLS_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR)/usr \
$(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR) \
-C $(@D) install-tools
endef

View File

@ -47,7 +47,7 @@ endef
define HOST_ZIP_INSTALL_CMDS
$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
prefix=$(HOST_DIR)/usr
prefix=$(HOST_DIR)
endef
$(eval $(generic-package))

View File

@ -38,7 +38,7 @@ define HOST_ZLIB_CONFIGURE_CMDS
$(HOST_CONFIGURE_ARGS) \
$(HOST_CONFIGURE_OPTS) \
./configure \
--prefix="$(HOST_DIR)/usr" \
--prefix="$(HOST_DIR)" \
--sysconfdir="$(HOST_DIR)/etc" \
)
endef