From: Herve Codina <herve.codina@bootlin.com>
To: buildroot@buildroot.org
Cc: Herve Codina <herve.codina@bootlin.com>,
Naumann Andreas <ANaumann@ultratronik.de>,
Peter Seiderer <ps.report@gmx.net>,
Julien Corjon <corjon.j@ecagroup.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
"Yann E . MORIN" <yann.morin.1998@free.fr>,
Ricardo Martincoski <ricardo.martincoski@gmail.com>
Subject: [Buildroot] [PATCH v3 16/16] package/pkg-generic.mk: move fixup-libtool-files to post-prepare hook
Date: Tue, 17 Aug 2021 10:39:30 +0200 [thread overview]
Message-ID: <20210817083930.3718711-17-herve.codina@bootlin.com> (raw)
In-Reply-To: <20210817083930.3718711-1-herve.codina@bootlin.com>
This commit moves fixup-libtool-files to the post-prepare hook
infrastructure.
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
---
New patch in this v3 series.
This modification was mentionned in the previous review
https://lore.kernel.org/buildroot/20210625092704.GJ2852@scaer/
package/pkg-generic.mk | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index bb9f395f27..d8ca8aaf31 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -92,14 +92,19 @@ endif
# Make sure .la files only reference the current per-package
# directory.
-
-# $1: package name (lower case)
-# $2: staging directory of the package
+#
+# Can't use $(foreach d, $(HOST_DIR)/lib* $(STAGING_DIR)/usr/lib*, ...)
+# because those directories may be created in the same recipe this macro will
+# be expanded in.
+# Additionally, either or both may be missing, which would make find whine and
+# fail.
+# So we just use HOST_DIR as a starting point, and filter on the two directories
+# of interest.
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
-define fixup-libtool-files
- $(Q)find $(2) \( -path '$(2)/lib*' -o -path '$(2)/usr/lib*' \) \
+define FIXUP_LIBTOOL_FILES
+ $(Q)find $(HOST_DIR) \( -path '$(HOST_DIR)/lib*' -o -path '$(STAGING_DIR)/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)/$($(PKG)_NAME)/:g"
endef
endif
@@ -226,8 +231,6 @@ define prepare-pre-configure
@$(call pkg_size_before,$(TARGET_DIR))
@$(call pkg_size_before,$(STAGING_DIR),-staging)
@$(call pkg_size_before,$(HOST_DIR),-host)
- $(call fixup-libtool-files,$(NAME),$(HOST_DIR))
- $(call fixup-libtool-files,$(NAME),$(STAGING_DIR))
$(foreach hook,$($(PKG)_POST_PREPARE_HOOKS),$(call $(hook))$(sep))
@$(call pkg_detect_overwrite_before,$(TARGET_DIR))
@$(call pkg_detect_overwrite_before,$(HOST_DIR),-host)
@@ -923,6 +926,7 @@ $(2)_POST_LEGAL_INFO_HOOKS ?=
$(2)_TARGET_FINALIZE_HOOKS ?=
$(2)_ROOTFS_PRE_CMD_HOOKS ?=
+$(2)_POST_PREPARE_HOOKS += FIXUP_LIBTOOL_FILES
$(2)_POST_PREPARE_HOOKS += FIXUP_PYTHON_SYSCONFIGDATA
ifeq ($$($(2)_TYPE),target)
--
2.31.1
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
next prev parent reply other threads:[~2021-08-17 8:42 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 8:39 [Buildroot] [PATCH v3 00/16] Overwritten file detection and fixes, one more step to TLP build Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 01/16] package/pkg-python: fix PKG_PYTHON_FIXUP_SYSCONFIGDATA Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 02/16] package/pkg-python: invalidate precompiled _sysconfigdata*.pyc Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 03/16] package/pkg-generic.mk: move python fixup to generic package infrastructure Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 04/16] package/owfs: remove Python sysconfigdata fixup Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 05/16] qt5: Fix sporadic build failure during top-level parallel build Herve Codina
2021-08-28 16:38 ` Yann E. MORIN
2021-08-28 17:39 ` Yann E. MORIN
2021-08-28 20:19 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 06/16] package/pkg-qmake.mk: Move QT5_QT_CONF_FIXUP to post-prepare hook Herve Codina
2021-08-28 20:19 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 07/16] package/pkg-generic.mk: detect files overwritten in TARGET_DIR and HOST_DIR Herve Codina
2021-08-28 22:47 ` Yann E. MORIN
2021-08-29 11:39 ` Thomas Petazzoni
2021-08-29 12:51 ` Yann E. MORIN
2021-08-29 16:40 ` Yann E. MORIN
2021-08-30 9:46 ` Arnout Vandecappelle
2021-08-29 15:01 ` Arnout Vandecappelle
2021-08-31 15:35 ` Andreas Naumann
2021-09-17 19:43 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 08/16] package/pkg-generic.mk: generate final rsync exclude file list Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 09/16] Makefile: rsync global {TARGET, HOST}_DIR using exclusion " Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 10/16] Makefile: breaks hardlinks in global {TARGET, HOST}_DIR on per-package build Herve Codina
2021-09-17 19:51 ` Yann E. MORIN
2023-10-01 12:56 ` Peter Korsgaard
2023-10-13 14:36 ` Peter Korsgaard
2021-08-17 8:39 ` [Buildroot] [PATCH v3 11/16] package/pkg-generic.mk: fix per-package <pkg>-{reconfigure, rebuild, reinstall} Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 12/16] package/pkg-generic.mk: remove .files-final-rsync.before temporary file Herve Codina
2021-08-17 8:39 ` [Buildroot] [PATCH v3 13/16] support/testing/infra: add log_file_path() function Herve Codina
2021-08-29 10:42 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 14/16] support/testing/tests: add test for check_bin_arch Herve Codina
2021-08-29 10:46 ` Yann E. MORIN
2021-08-17 8:39 ` [Buildroot] [PATCH v3 15/16] support/testing/tests: add test for file overwrite detection Herve Codina
2021-08-17 8:39 ` Herve Codina [this message]
2021-08-28 14:47 ` [Buildroot] [PATCH v3 00/16] Overwritten file detection and fixes, one more step to TLP build Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210817083930.3718711-17-herve.codina@bootlin.com \
--to=herve.codina@bootlin.com \
--cc=ANaumann@ultratronik.de \
--cc=buildroot@buildroot.org \
--cc=corjon.j@ecagroup.com \
--cc=ps.report@gmx.net \
--cc=ricardo.martincoski@gmail.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=yann.morin.1998@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).