[Buildroot] [PATCH v7 5/8] package/pkg-generic: make libtool .la files compatible with per-package directories
Yann E. MORIN
yann.morin.1998 at free.fr
Mon Dec 31 08:44:32 UTC 2018
Thomas, All,
On 2018-12-28 11:43 +0100, Thomas Petazzoni spake thusly:
> Libtool .la files unfortunately contain a number of absolute paths,
> which now refer to per-package directories. Due to this, when building
> package A, .la files may contain absolute paths referring to
> directories in package B per-package sysroot. This causes some -L
> flags referring to other sysroot from being added, which doesn't work
> as the linker no longer realizes that such paths are within its
> sysroot.
>
> To fix this, we introduce a replacement step of .la files in the
> configure step, to make sure all paths refer to this package
> per-package directory.
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
> ---
> package/pkg-generic.mk | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 8ea86514d7..9575639b43 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -126,6 +126,21 @@ endef
> GLOBAL_INSTRUMENTATION_HOOKS += step_user
> endif
>
> +#######################################
> +# Helper functions
> +
> +# Make sure .la files only reference the current per-package
> +# directory.
> +
> +# $1: package name (lower case)
> +# $2: staging directory of the package
> +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
> +define fixup-libtool-files
> + $(Q)find $(2)/usr/lib* -name "*.la" | xargs --no-run-if-empty \
> + $(SED) "s:$(PER_PACKAGE_DIR)/[^/]*/:$(PER_PACKAGE_DIR)/$(1)/:g"
^^^^^^^
This can match the string '//'. Don't you in fact want to match at least
one char? I.e.: $(PER_PACKAGE_DIR)/[^/]+/
> +endef
> +endif
> +
> ################################################################################
> # Implicit targets -- produce a stamp file for each step of a package build
> ################################################################################
> @@ -222,6 +237,7 @@ $(BUILD_DIR)/%/.stamp_configured:
> @$(call step_start,configure)
> @$(call MESSAGE,"Configuring")
> $(call prepare-per-package-directory,$($(PKG)_FINAL_DEPENDENCIES))
> + $(call fixup-libtool-files,$(NAME),$(STAGING_DIR))
At some point, we may have to turn that into a generic hook-registration
mechanism.
For example, in inner-generic-package:
$(2)_PRE_CONFIGURE_HOOKS_FINAL = \
PREPARE_PER_PACKAGE_DIRECTORY \
FIXUP_LIBTOOL_FILES \
$($(2)_PRECONFIGURE_HOOKS)
> $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
... and here, we'd use $($(PKG)_PRE_CONFIGURE_HOOKS_FINAL).
Similarly for the other hooks, of course...
But that's for the future! ;-)
Regards,
Yann E. MORIN.
> $($(PKG)_CONFIGURE_CMDS)
> $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep))
> @@ -879,6 +895,7 @@ $$($(2)_TARGET_INSTALL_IMAGES): PKG=$(2)
> $$($(2)_TARGET_INSTALL_HOST): PKG=$(2)
> $$($(2)_TARGET_BUILD): PKG=$(2)
> $$($(2)_TARGET_CONFIGURE): PKG=$(2)
> +$$($(2)_TARGET_CONFIGURE): NAME=$(1)
> $$($(2)_TARGET_RSYNC): SRCDIR=$$($(2)_OVERRIDE_SRCDIR)
> $$($(2)_TARGET_RSYNC): PKG=$(2)
> $$($(2)_TARGET_PATCH): PKG=$(2)
> --
> 2.20.1
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list