[Buildroot] [PATCH v4 01/36] generic packages: use $(HOST_DIR) instead of $(HOST_DIR)/usr as prefix

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

From: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v4 01/36] generic packages: use $(HOST_DIR) instead of $(HOST_DIR)/usr as prefix
Date: Wed, 5 Jul 2017 13:14:18 +0200	[thread overview]
Message-ID: <20170705111453.2284-2-arnout@mind.be> (raw)
In-Reply-To: <20170705111453.2284-1-arnout@mind.be>

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>
---
 package/acl/acl.mk                               | 4 ++--
 package/acpica/acpica.mk                         | 2 +-
 package/attr/attr.mk                             | 4 ++--
 package/boost/boost.mk                           | 4 ++--
 package/bzip2/bzip2.mk                           | 4 ++--
 package/cmake/cmake.mk                           | 2 +-
 package/cryptopp/cryptopp.mk                     | 2 +-
 package/dtc/dtc.mk                               | 4 ++--
 package/execline/execline.mk                     | 2 +-
 package/faketime/faketime.mk                     | 4 ++--
 package/gcc/gcc-final/gcc-final.mk               | 2 +-
 package/kodi/kodi.mk                             | 2 +-
 package/libsepol/libsepol.mk                     | 2 +-
 package/libxml-parser-perl/libxml-parser-perl.mk | 2 +-
 package/luajit/luajit.mk                         | 4 ++--
 package/luarocks/luarocks.mk                     | 4 ++--
 package/lz4/lz4.mk                               | 2 +-
 package/nodejs/nodejs.mk                         | 2 +-
 package/openssl/openssl.mk                       | 2 +-
 package/perl/perl.mk                             | 2 +-
 package/pngquant/pngquant.mk                     | 2 +-
 package/qemu/qemu.mk                             | 2 +-
 package/s6-rc/s6-rc.mk                           | 2 +-
 package/s6/s6.mk                                 | 2 +-
 package/sdl_image/sdl_image.mk                   | 4 ++--
 package/skalibs/skalibs.mk                       | 2 +-
 package/sunxi-tools/sunxi-tools.mk               | 4 ++--
 package/zip/zip.mk                               | 2 +-
 package/zlib/zlib.mk                             | 2 +-
 29 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/package/acl/acl.mk b/package/acl/acl.mk
index edcf4fd8ed..9e57d09131 100644
--- a/package/acl/acl.mk
+++ b/package/acl/acl.mk
@@ -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.
diff --git a/package/acpica/acpica.mk b/package/acpica/acpica.mk
index 8cfe793510..57cc37f85e 100644
--- a/package/acpica/acpica.mk
+++ b/package/acpica/acpica.mk
@@ -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
 
diff --git a/package/attr/attr.mk b/package/attr/attr.mk
index 0c85701e07..8d250608b7 100644
--- a/package/attr/attr.mk
+++ b/package/attr/attr.mk
@@ -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
diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 874c03fcb6..3600cdea84 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -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
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 0597ab97d6..62571ed5a3 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -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))
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
index 46bd1e4e5f..d5d18ffd3c 100644
--- a/package/cmake/cmake.mk
+++ b/package/cmake/cmake.mk
@@ -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)" \
diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk
index 5c5def5bc5..4b121aef2d 100644
--- a/package/cryptopp/cryptopp.mk
+++ b/package/cryptopp/cryptopp.mk
@@ -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))
diff --git a/package/dtc/dtc.mk b/package/dtc/dtc.mk
index 9d50e35966..dd0f30d9ae 100644
--- a/package/dtc/dtc.mk
+++ b/package/dtc/dtc.mk
@@ -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))
diff --git a/package/execline/execline.mk b/package/execline/execline.mk
index cc56a3a8b6..86ed3f2d86 100644
--- a/package/execline/execline.mk
+++ b/package/execline/execline.mk
@@ -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 \
diff --git a/package/faketime/faketime.mk b/package/faketime/faketime.mk
index 03879ea65c..6c88a71aa3 100644
--- a/package/faketime/faketime.mk
+++ b/package/faketime/faketime.mk
@@ -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))
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 12f08c81a8..78466fa4da 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -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) \
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index 7a031b7485..d595920075 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -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 \
diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
index d360bfbcb1..233334eea2 100644
--- a/package/libsepol/libsepol.mk
+++ b/package/libsepol/libsepol.mk
@@ -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)
diff --git a/package/libxml-parser-perl/libxml-parser-perl.mk b/package/libxml-parser-perl/libxml-parser-perl.mk
index 401470d907..bca1c34a8f 100644
--- a/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -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 \
diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk
index 300e6dbc29..939fa660d8 100644
--- a/package/luajit/luajit.mk
+++ b/package/luajit/luajit.mk
@@ -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))
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index d18056a527..646e43b668 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -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)
diff --git a/package/lz4/lz4.mk b/package/lz4/lz4.mk
index d350d4c099..91ff43b052 100644
--- a/package/lz4/lz4.mk
+++ b/package/lz4/lz4.mk
@@ -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
 
diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index b5d73be6e0..ecdc9ce290 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -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 \
diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk
index 5f56b445ab..ec8e6f204c 100644
--- a/package/openssl/openssl.mk
+++ b/package/openssl/openssl.mk
@@ -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 \
diff --git a/package/perl/perl.mk b/package/perl/perl.mk
index ca23eb0bf7..fb0cec3d4a 100644
--- a/package/perl/perl.mk
+++ b/package/perl/perl.mk
@@ -91,7 +91,7 @@ endef
 
 HOST_PERL_CONF_OPTS = \
 	-des \
-	-Dprefix="$(HOST_DIR)/usr" \
+	-Dprefix="$(HOST_DIR)" \
 	-Dcc="$(HOSTCC)"
 
 define HOST_PERL_CONFIGURE_CMDS
diff --git a/package/pngquant/pngquant.mk b/package/pngquant/pngquant.mk
index 938603a21d..f0104fb074 100644
--- a/package/pngquant/pngquant.mk
+++ b/package/pngquant/pngquant.mk
@@ -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
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk
index 9335467a28..e11307cde8 100644
--- a/package/qemu/qemu.mk
+++ b/package/qemu/qemu.mk
@@ -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)" \
diff --git a/package/s6-rc/s6-rc.mk b/package/s6-rc/s6-rc.mk
index 16089dc23a..0e25f038ed 100644
--- a/package/s6-rc/s6-rc.mk
+++ b/package/s6-rc/s6-rc.mk
@@ -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 \
diff --git a/package/s6/s6.mk b/package/s6/s6.mk
index f0235da45e..411345781d 100644
--- a/package/s6/s6.mk
+++ b/package/s6/s6.mk
@@ -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 \
diff --git a/package/sdl_image/sdl_image.mk b/package/sdl_image/sdl_image.mk
index 6ea657bcff..ee0712cc27 100644
--- a/package/sdl_image/sdl_image.mk
+++ b/package/sdl_image/sdl_image.mk
@@ -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 \
diff --git a/package/skalibs/skalibs.mk b/package/skalibs/skalibs.mk
index c6f97ee997..b8526dd778 100644
--- a/package/skalibs/skalibs.mk
+++ b/package/skalibs/skalibs.mk
@@ -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
diff --git a/package/sunxi-tools/sunxi-tools.mk b/package/sunxi-tools/sunxi-tools.mk
index 9bb0b9eff9..c193769c10 100644
--- a/package/sunxi-tools/sunxi-tools.mk
+++ b/package/sunxi-tools/sunxi-tools.mk
@@ -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
 
diff --git a/package/zip/zip.mk b/package/zip/zip.mk
index 66d94b3c68..0bd3d3c11f 100644
--- a/package/zip/zip.mk
+++ b/package/zip/zip.mk
@@ -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))
diff --git a/package/zlib/zlib.mk b/package/zlib/zlib.mk
index 23c6e95cfa..9b5f52e807 100644
--- a/package/zlib/zlib.mk
+++ b/package/zlib/zlib.mk
@@ -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
-- 
2.13.2

next prev parent reply	other threads:[~2017-07-05 11:14 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-05 11:14 [Buildroot] [PATCH v4 00/36] Remove /usr component from HOST_DIR (continued) Arnout Vandecappelle
2017-07-05 11:14 ` Arnout Vandecappelle [this message]
2017-07-05 11:14 ` [Buildroot] [PATCH v4 02/36] Globally replace $(HOST_DIR)/usr/bin with $(HOST_DIR)/bin Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 03/36] Globally replace $(HOST_DIR)/usr/sbin with $(HOST_DIR)/sbin Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 04/36] Globally replace $(HOST_DIR)/usr/lib with $(HOST_DIR)/lib Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 05/36] Globally replace $(HOST_DIR)/usr/include with $(HOST_DIR)/include Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 06/36] Globally replace $(HOST_DIR)/usr/share with $(HOST_DIR)/share Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 07/36] Globally replace $(HOST_DIR)/usr with $(HOST_DIR) Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 08/36] qt: fix up alignment after mechanical replacement Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 09/36] boards: replace $HOST_DIR/usr/ with $HOST_DIR/ in scripts Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 10/36] chromebook snow: remove $(HOST_DIR)/usr reference from README Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 11/36] warpboard: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 12/36] stm32f429-disco: replace $HOST_DIR/usr with $HOST_DIR in flash script Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 13/36] stm32f469-disco: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 14/36] eclipse-register-toolchain: toolchain is no longer installed in $(HOST_DIR)/usr Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 15/36] manual: remove references to host/usr paths Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 16/36] grub2: remove host/usr reference from help text Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 17/36] lttng-tools: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 18/36] mfgtools: remove host/usr reference from readme.txt Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 19/36] lesstif: remove host/usr reference from .mk comment Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 20/36] board/gdb/bfin-bf512: remove host/usr reference from readme.txt Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 21/36] board/csky: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 22/36] libffi: avoid $(HOST_DIR)/usr while moving headers Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 23/36] genromfs: use $(HOST_DIR) instead of $(HOST_DIR)/usr as prefix Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 24/36] libcap: use $(HOST_DIR) as prefix instead of DESTDIR Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 25/36] lzip: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 26/36] opkg-utils: use $(HOST_DIR) as PREFIX " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 27/36] raspberrypi-usbboot: remove /usr from DESTDIR-based install commands Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 28/36] dos2unix: use prefix instead of DESTDIR for host installation Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 29/36] imx-uxb-loader: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 30/36] grub2: install in $(HOST_DIR) instead of $(HOST_DIR)/usr Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 31/36] sepolgen: strip /usr/ part from HOST_DIR Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 32/36] libsemanage: rework host installation Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 33/36] libselinux: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 34/36] checkpolicy: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 35/36] policycoreutils: " Arnout Vandecappelle
2017-07-05 11:14 ` [Buildroot] [PATCH v4 36/36] execline: remove --shebangdir configure option Arnout Vandecappelle
2017-07-05 14:31 ` [Buildroot] [PATCH v4 00/36] Remove /usr component from HOST_DIR (continued) Thomas Petazzoni

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:edcf4fd8e dfblob:9e57d0913 dfblob:8cfe79351 dfblob:57cc37f85
dfblob:0c85701e0 dfblob:8d250608b dfblob:874c03fcb dfblob:3600cdea8
dfblob:0597ab97d dfblob:62571ed5a dfblob:46bd1e4e5 dfblob:d5d18ffd3
dfblob:5c5def5bc dfblob:4b121aef2 dfblob:9d50e3596 dfblob:dd0f30d9a
dfblob:cc56a3a8b dfblob:86ed3f2d8 dfblob:03879ea65 dfblob:6c88a71aa
dfblob:12f08c81a dfblob:78466fa4d dfblob:7a031b748 dfblob:d59592007
dfblob:d360bfbcb dfblob:233334eea dfblob:401470d90 dfblob:bca1c34a8
dfblob:300e6dbc2 dfblob:939fa660d dfblob:d18056a52 dfblob:646e43b66
dfblob:d350d4c09 dfblob:91ff43b05 dfblob:b5d73be6e dfblob:ecdc9ce29
dfblob:5f56b445a dfblob:ec8e6f204 dfblob:ca23eb0bf dfblob:fb0cec3d4
dfblob:938603a21 dfblob:f0104fb07 dfblob:9335467a2 dfblob:e11307cde
dfblob:16089dc23 dfblob:0e25f038e dfblob:f0235da45 dfblob:411345781
dfblob:6ea657bcf dfblob:ee0712cc2 dfblob:c6f97ee99 dfblob:b8526dd77
dfblob:9bb0b9eff dfblob:c193769c1 dfblob:66d94b3c6 dfblob:0bd3d3c11
dfblob:23c6e95cf dfblob:9b5f52e80 )
 OR (
bs:"[Buildroot] [PATCH v4 01/36] generic packages: use $(HOST_DIR) instead of $(HOST_DIR)/usr as prefix" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170705111453.2284-2-arnout@mind.be \
    --to=arnout@mind.be \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox