[Buildroot] [PATCH v3] HOST_DIR/lib: symlink respectively to lib32/64
Matt Weber
matthew.weber at rockwellcollins.com
Wed Oct 4 12:41:48 UTC 2017
Discovered the issue on a RHEL7.4 machine where
the cmake build dynamically selected HOST_DIR/lib64
as the installation path for the lzo2 library.
Fixes failures like the following:
host-mtd
http://autobuild.buildroot.net/results/d31/d31581d2e60f35cf70312683df99c768e2ea8516/
host-squashfs
http://autobuild.buildroot.net/results/d9c/d9c95231ac774ed71580754a15ebb3b121764310/
Signed-off-by: Matthew Weber <matthew.weber at rockwellcollins.com>
---
Changes
[Yann
v2 -> v3
- Updated hostarch logic to check for 64bit in the name
and if present create link. This supports all archs
vs just x86.
v1 -> v2
- Correct the condition used to determine host arch.
(Previously used the target arch check)
---
Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 9b09589..601de1d 100644
--- a/Makefile
+++ b/Makefile
@@ -542,7 +542,7 @@ endif
.PHONY: dirs
dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
- $(HOST_DIR) $(HOST_DIR)/usr $(BINARIES_DIR)
+ $(HOST_DIR) $(HOST_DIR)/usr $(HOST_DIR)/lib $(BINARIES_DIR)
$(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
$(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
@@ -565,6 +565,13 @@ sdk: world
$(HOST_DIR)/usr: $(HOST_DIR)
@ln -snf . $@
+$(HOST_DIR)/lib: $(HOST_DIR)
+ @mkdir -p $@
+ case $(HOSTARCH) in \
+ (*64) ln -s lib $(@D)/lib64;; \
+ (*) ln -s lib $(@D)/lib32;; \
+ esac
+
# Populating the staging with the base directories is handled by the skeleton package
$(STAGING_DIR):
@mkdir -p $(STAGING_DIR)
--
1.9.1
More information about the buildroot
mailing list