[Buildroot] [PATCH v5 12/19] infra-libtool: no longer prepend STAGING_DIR to libdir
Jérôme Pouiller
jezz at sysmic.org
Tue Dec 20 13:46:29 UTC 2016
Since `$lt_sysroot' is now correctly filled, it is no more necessary to patch
`.la' files. Indeed, if $libdir point to `/usr/lib', libtool will also search
in `$(lt_sysroot)/usr/lib'
Signed-off-by: Jérôme Pouiller <jezz at sysmic.org>
---
package/pkg-generic.mk | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 827de62..5d12ac3 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -268,17 +268,6 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
-e "s, at BASE_DIR@,$(BASE_DIR),g" \
$(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ;\
fi
- @$(call MESSAGE,"Fixing libtool files")
- $(Q)find $(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \
- $(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \
- -e "s:$(STAGING_DIR):@STAGING_DIR@:g" \
- $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\
- -e "s:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:g") \
- -e "s:\(['= ]\)/usr:\\1 at STAGING_DIR@/usr:g" \
- $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\
- -e "s:@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):g") \
- -e "s:@STAGING_DIR@:$(STAGING_DIR):g" \
- -e "s:@BASE_DIR@:$(BASE_DIR):g"
@$(call step_end,install-staging)
$(Q)touch $@
--
1.9.1
More information about the buildroot
mailing list