[Buildroot] [PATCH] core/pkg-infra: tweak only .la files that need it
Thomas De Schampheleire
patrickdepinguin at gmail.com
Sun Feb 10 19:23:12 UTC 2019
Hi Yann,
El dom., 10 feb. 2019 a las 9:48, Yann E. MORIN
(<yann.morin.1998 at free.fr>) escribió:
>
> Currently, when we tweak the .la files, we do so unconditionally on all
> .la files, even those we already fixed in a previous run.
>
> This has the nasty side effect that each .la file will be reported as
> being touched by all packages that are installed after the package that
> actually installed said .la file.
>
> Since we can't easily know what fiels were isntalled by a package (that
files
installed
> is an instrumetnation hook, and comes after the mangling), we use a
instrumentation
> trick (like is done in libtool?): we do mangle all files, each in into a
/in/d
> temporary location; if the result is identical to the input, we remove
> the temporary, while if the resiult differes from the output, we move
result differs
> the temporary to the input.
>
> Reported-by: Nicolas Cavallari <nicolas.cavallari at green-communications.fr>
> Reported-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
> Cc: Nicolas Cavallari <nicolas.cavallari at green-communications.fr>
> Cc: Thomas De Schampheleire <patrickdepinguin at gmail.com>
> Cc: Arnout Vandecappelle <arnout at mind.be>
> ---
> package/pkg-generic.mk | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 6168b40e89..afd0d41e2a 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -294,7 +294,8 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
> $(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 \
> + $(Q)for la in $(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \
> + cp -a "$${la}" "$${la}.fixed" && \
> $(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \
> -e "s:$(STAGING_DIR):@STAGING_DIR@:g" \
> $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\
> @@ -303,7 +304,14 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
> $(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"
> + -e "s:@BASE_DIR@:$(BASE_DIR):g"; \
The semicolon shouldn't be here, right? I.e. the "$${la}.fixed" below
is the argument to the sed command, no?
> + "$${la}.fixed" && \
> + if cmp "$${la}" "$${la}.fixed"; then \
> + rm -f "$${la}.fixed"; \
> + else \
> + mv "$${la}.fixed" "$${la}"; \
> + fi || exit 1; \
> + done
> @$(call step_end,install-staging)
> $(Q)touch $@
>
I did not test it but it looks a valid approach.
Best regards,
Thomas
More information about the buildroot
mailing list