[Buildroot] [git commit] Globally replace $(HOST_DIR)/usr with $(HOST_DIR)
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Wed Jul 5 13:22:29 UTC 2017
commit: https://git.buildroot.net/buildroot/commit/?id=685f44de98caec74eefd048b01b8550b63784300
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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' | xargs sed -i 's%\$(HOST_DIR)/usr%$(HOST_DIR)%g'
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
package/erlang/erlang.mk | 2 +-
package/gcc/gcc.mk | 10 +++++-----
package/libsepol/libsepol.mk | 2 +-
package/lua/lua.mk | 2 +-
package/luarocks/luarocks.mk | 4 ++--
package/omxplayer/omxplayer.mk | 2 +-
package/pseudo/pseudo.mk | 2 +-
package/qt/qt.mk | 6 +++---
package/qt5/qt5base/qt5base.mk | 2 +-
package/setools/setools.mk | 4 ++--
package/upx/upx.mk | 2 +-
package/vboot-utils/vboot-utils.mk | 2 +-
12 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk
index 0f04a84..f3684d0 100644
--- a/package/erlang/erlang.mk
+++ b/package/erlang/erlang.mk
@@ -39,7 +39,7 @@ HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D)
# erlang uses openssl for all things crypto. Since the host tools (such as
# rebar) uses crypto, we need to build host-erlang with support for openssl.
HOST_ERLANG_DEPENDENCIES = host-openssl
-HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)/usr
+HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)
HOST_ERLANG_CONF_OPTS += --without-termcap
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index bdeb956..ff69209 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -92,9 +92,9 @@ HOST_GCC_COMMON_CONF_OPTS = \
--with-gnu-ld \
--disable-libssp \
--disable-multilib \
- --with-gmp=$(HOST_DIR)/usr \
- --with-mpc=$(HOST_DIR)/usr \
- --with-mpfr=$(HOST_DIR)/usr \
+ --with-gmp=$(HOST_DIR) \
+ --with-mpc=$(HOST_DIR) \
+ --with-mpfr=$(HOST_DIR) \
--with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \
--with-bugurl="http://bugs.buildroot.net/"
@@ -169,12 +169,12 @@ endif
ifeq ($(BR2_GCC_ENABLE_GRAPHITE),y)
HOST_GCC_COMMON_DEPENDENCIES += host-isl
-HOST_GCC_COMMON_CONF_OPTS += --with-isl=$(HOST_DIR)/usr
+HOST_GCC_COMMON_CONF_OPTS += --with-isl=$(HOST_DIR)
# gcc 5 doesn't need cloog any more, see
# https://gcc.gnu.org/gcc-5/changes.html
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),)
HOST_GCC_COMMON_DEPENDENCIES += host-cloog
-HOST_GCC_COMMON_CONF_OPTS += --with-cloog=$(HOST_DIR)/usr
+HOST_GCC_COMMON_CONF_OPTS += --with-cloog=$(HOST_DIR)
endif
else
HOST_GCC_COMMON_CONF_OPTS += --without-isl --without-cloog
diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
index 710ab25..21ca419 100644
--- a/package/libsepol/libsepol.mk
+++ b/package/libsepol/libsepol.mk
@@ -35,7 +35,7 @@ endef
HOST_LIBSEPOL_MAKE_ENV = \
$(HOST_MAKE_ENV) \
- DESTDIR=$(HOST_DIR)/usr \
+ DESTDIR=$(HOST_DIR) \
PREFIX=$(HOST_DIR)
define HOST_LIBSEPOL_BUILD_CMDS
diff --git a/package/lua/lua.mk b/package/lua/lua.mk
index 5810b5f..93339ad 100644
--- a/package/lua/lua.mk
+++ b/package/lua/lua.mk
@@ -95,7 +95,7 @@ define LUA_INSTALL_TARGET_CMDS
endef
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)" -C $(@D) install
$(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \
$(HOST_DIR)/lib/pkgconfig/lua.pc
endef
diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk
index e965ab2..bc700a5 100644
--- a/package/luarocks/luarocks.mk
+++ b/package/luarocks/luarocks.mk
@@ -11,7 +11,7 @@ LUAROCKS_LICENSE_FILES = COPYING
HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter
-LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
+LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc/luarocks
LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
ifeq ($(BR2_PACKAGE_LUA_5_3),y)
@@ -21,7 +21,7 @@ endif
HOST_LUAROCKS_CONF_OPTS = \
--prefix=$(HOST_DIR) \
--sysconfdir=$(LUAROCKS_CONFIG_DIR) \
- --with-lua=$(HOST_DIR)/usr
+ --with-lua=$(HOST_DIR)
ifeq ($(BR2_PACKAGE_LUAJIT),y)
HOST_LUAROCKS_CONF_OPTS += --lua-suffix=jit
diff --git a/package/omxplayer/omxplayer.mk b/package/omxplayer/omxplayer.mk
index 7425014..9bb5877 100644
--- a/package/omxplayer/omxplayer.mk
+++ b/package/omxplayer/omxplayer.mk
@@ -27,7 +27,7 @@ OMXPLAYER_MAKE_ENV = \
BUILDROOT=$(TOP_DIR) \
SDKSTAGE=$(STAGING_DIR) \
TARGETFS=$(TARGET_DIR) \
- TOOLCHAIN=$(HOST_DIR)/usr \
+ TOOLCHAIN=$(HOST_DIR) \
HOST=$(GNU_TARGET_NAME) \
SYSROOT=$(STAGING_DIR) \
JOBS=$(PARALLEL_JOBS) \
diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk
index d78fc7a..4464271 100644
--- a/package/pseudo/pseudo.mk
+++ b/package/pseudo/pseudo.mk
@@ -24,6 +24,6 @@ HOST_PSEUDO_CONF_OPTS = \
--with-rpath=$(HOST_DIR)/lib \
--bits=$(if $(filter %64,$(HOSTARCH)),64,32) \
--libdir=$(HOST_DIR)/lib \
- --with-sqlite=$(HOST_DIR)/usr
+ --with-sqlite=$(HOST_DIR)
$(eval $(host-autotools-package))
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index cb1f01e..d867718 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -598,10 +598,10 @@ QT_CONF_FILE = $(HOST_DIR)/bin/qt.conf
define QT_INSTALL_QT_CONF
mkdir -p $(dir $(QT_CONF_FILE))
echo "[Paths]" > $(QT_CONF_FILE)
- echo "Prefix=$(HOST_DIR)/usr" >> $(QT_CONF_FILE)
+ echo "Prefix=$(HOST_DIR)" >> $(QT_CONF_FILE)
echo "Headers=$(STAGING_DIR)/usr/include" >> $(QT_CONF_FILE)
echo "Libraries=$(STAGING_DIR)/usr/lib" >> $(QT_CONF_FILE)
- echo "Data=$(HOST_DIR)/usr" >> $(QT_CONF_FILE)
+ echo "Data=$(HOST_DIR)" >> $(QT_CONF_FILE)
echo "Binaries=$(HOST_DIR)/bin" >> $(QT_CONF_FILE)
endef
@@ -616,7 +616,7 @@ define QT_INSTALL_STAGING_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
mkdir -p $(HOST_DIR)/bin
mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/bin
- ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs
+ ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/mkspecs
$(QT_INSTALL_QT_CONF)
for i in moc uic rcc lupdate lrelease ; do \
$(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/bin/$${i}," \
diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 5fe8bb8..c5d2aa1 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -239,7 +239,7 @@ define QT5BASE_CONFIGURE_CMDS
./configure \
-v \
-prefix /usr \
- -hostprefix $(HOST_DIR)/usr \
+ -hostprefix $(HOST_DIR) \
-headerdir /usr/include/qt5 \
-sysroot $(STAGING_DIR) \
-plugindir /usr/lib/qt/plugins \
diff --git a/package/setools/setools.mk b/package/setools/setools.mk
index 5e101b1..d2e9f05 100644
--- a/package/setools/setools.mk
+++ b/package/setools/setools.mk
@@ -64,8 +64,8 @@ HOST_SETOOLS_CONF_OPTS = \
--disable-swig-java \
--disable-swig-python \
--disable-swig-tcl \
- --with-sepol-devel="$(HOST_DIR)/usr" \
- --with-selinux-devel="$(HOST_DIR)/usr" \
+ --with-sepol-devel="$(HOST_DIR)" \
+ --with-selinux-devel="$(HOST_DIR)" \
PYTHON_LDFLAGS="-L$(HOST_DIR)/lib/" \
PYTHON_CPPFLAGS="-I$(HOST_SETOOLS_PYTHON_INCLUDES)" \
PYTHON_SITE_PKG="$(HOST_SETOOLS_PYTHON_SITE_PACKAGES)" \
diff --git a/package/upx/upx.mk b/package/upx/upx.mk
index eec88c7..1fe7162 100644
--- a/package/upx/upx.mk
+++ b/package/upx/upx.mk
@@ -16,7 +16,7 @@ HOST_UPX_DEPENDENCIES = host-ucl host-zlib
# stating to "please choose a target for 'make'"... :-(
define HOST_UPX_BUILD_CMDS
$(HOST_MAKE_ENV) $(MAKE) CPPFLAGS="$(HOST_CPPFLAGS)" \
- LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR)/usr \
+ LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR) \
CXXFLAGS_WERROR= \
-C $(@D) all
endef
diff --git a/package/vboot-utils/vboot-utils.mk b/package/vboot-utils/vboot-utils.mk
index 9879dba..a6a67ad 100644
--- a/package/vboot-utils/vboot-utils.mk
+++ b/package/vboot-utils/vboot-utils.mk
@@ -31,7 +31,7 @@ define HOST_VBOOT_UTILS_BUILD_CMDS
endef
define HOST_VBOOT_UTILS_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR)/usr \
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \
futil_install cgpt_install devkeys_install
endef
More information about the buildroot
mailing list