From 39bd319073942693f93a05b67a5e6c1483b09ca8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 23 Sep 2023 13:49:30 -0400 Subject: [PATCH 1/2] xbps-src: follow symlinks when fixing up pkg-config files Packages (e.g., python3-pybind11) that symlink to *.pc files in /usr/{lib,share}/pkgconfig will have those links overwritten with actual copies of the files after the hook common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh attempts to remove $XBPS_CROSS_BASE from paths. This will result in the new copy containing corrected paths, but the original file remaining uncorrected. This was stolen fro @tornaria. --- .../post-install/13-pkg-config-clean-xbps-cross-base-ref.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh b/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh index 5cdfb0e9bfd2be..88ad06c41983a8 100644 --- a/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh +++ b/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh @@ -16,7 +16,8 @@ hook() { # s,/usr/armv7l-linux-musleabihf/usr,/usr,g # trailing /usr to avoid clashing with # other $XBPS_CROSS_BASE and $XBPS_CROSS_TRIPLET. - sed -i -e "s,$XBPS_CROSS_BASE/usr,/usr,g" "$f" + sed -i --follow-symlinks \ + -e "s,$XBPS_CROSS_BASE/usr,/usr,g" "$f" fi done } From 2792129196a2a6e791a45a8cc79187118adf1faa Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 23 Sep 2023 13:51:53 -0400 Subject: [PATCH 2/2] python3-pybind11: rebuild to fix pkgconfig symlink --- srcpkgs/python3-pybind11/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/python3-pybind11/template b/srcpkgs/python3-pybind11/template index 0282b97b6db712..09e5d4af8ae3c3 100644 --- a/srcpkgs/python3-pybind11/template +++ b/srcpkgs/python3-pybind11/template @@ -1,7 +1,7 @@ # Template file for 'python3-pybind11' pkgname=python3-pybind11 version=2.11.1 -revision=2 +revision=3 build_style=python3-module hostmakedepends="cmake python3-setuptools python3-pytest python3-sphinx_rtd_theme python3-breathe"