NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/pkg-generic.mk: perform .la files fixup in per-package HOST_DIR

Browse Source 
fixup-libtool-files was called on per-package STAGING_DIR.
Some host-xxxx packages have their .la files with directories
pointing outside their own per-package directory.

This commit, calling fixup-libtool-files on HOST_DIR, fixes this
issue.

Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Herve Codina 2021-07-06 16:24:46 +02:00 committed by Yann E. MORIN
parent d889838098
commit 31af8797d5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/pkg-generic.mk
View File

@ -97,7 +97,8 @@ endif
# $2: staging directory of the package # $2: staging directory of the package
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
define fixup-libtool-files define fixup-libtool-files
$(Q)find $(2)/usr/lib* -name "*.la" | xargs --no-run-if-empty \ $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \
-name "*.la" -print0 | xargs -0 --no-run-if-empty \
$(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g" $(SED) "s:$(PER_PACKAGE_DIR)/[^/]\+/:$(PER_PACKAGE_DIR)/$(1)/:g"
endef endef
endif endif
@ -252,6 +253,7 @@ $(BUILD_DIR)/%/.stamp_configured:
@$(call pkg_size_before,$(TARGET_DIR)) @$(call pkg_size_before,$(TARGET_DIR))
@$(call pkg_size_before,$(STAGING_DIR),-staging) @$(call pkg_size_before,$(STAGING_DIR),-staging)
@$(call pkg_size_before,$(HOST_DIR),-host) @$(call pkg_size_before,$(HOST_DIR),-host)
$(call fixup-libtool-files,$(NAME),$(HOST_DIR))
$(call fixup-libtool-files,$(NAME),$(STAGING_DIR)) $(call fixup-libtool-files,$(NAME),$(STAGING_DIR))
$(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep))
$($(PKG)_CONFIGURE_CMDS) $($(PKG)_CONFIGURE_CMDS)