[Buildroot] [PATCH] HOST_DIR/lib: symlink respectively to lib32/64
Matthew Weber
matthew.weber at rockwellcollins.com
Tue Oct 3 18:40:58 UTC 2017
Yann,
On Tue, Oct 3, 2017 at 1:12 PM, Matt Weber
<matthew.weber at rockwellcollins.com> wrote:
> Modeled after system/system.mk creation of
> TARGET_DIR equivalent.
>
> 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>
> ---
> Makefile | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 9b09589..d51f8ce 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,15 @@ sdk: world
> $(HOST_DIR)/usr: $(HOST_DIR)
> @ln -snf . $@
>
> +$(HOST_DIR)/lib: $(HOST_DIR)
> +# Make a symlink lib32->lib or lib64->lib as appropriate.
> +# MIPS64/n32 requires lib32 even though it's a 64-bit arch.
> +ifeq ($(BR2_ARCH_IS_64)$(BR2_MIPS_NABI32),y)
> + @ln -snf lib $@64
> +else
> + @ln -snf lib $@32
> +endif
> +
Good catch, wasn't thinking about the conditional. Here's my proposed
update (testing it now).
$(HOST_DIR)/lib: $(HOST_DIR)
ifeq ($(HOSTARCH),x86)
@ln -snf lib $@32
else
@ln -snf lib $@64
endif
Matt
More information about the buildroot
mailing list