From eefc3f638ac24448c270977d8996188c50ba4066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 19 May 2020 21:55:50 +0700 Subject: [PATCH 1/4] libxslt: remove $XBPS_CROSS_BASE reference from pkg-config Partial-fixes: #19642 --- srcpkgs/libxslt/template | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template index a488405bdb9..e38b28fff11 100644 --- a/srcpkgs/libxslt/template +++ b/srcpkgs/libxslt/template @@ -1,7 +1,7 @@ # Template file for 'libxslt' pkgname=libxslt version=1.1.34 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --disable-dependency-tracking" hostmakedepends="libtool" @@ -34,7 +34,15 @@ post_configure() { post_install() { # Remove references to the install(1) wrapper. - sed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i ${DESTDIR}/usr/bin/xslt-config + vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i ${DESTDIR}/usr/bin/xslt-config + if [ "$CROSS_BUILD" ]; then + # Remove $XBPS_CROSS_BASE in pkg-config + vsed -i -e "s,$XBPS_CROSS_BASE,,g" \ + $DESTDIR/usr/bin/xslt-config \ + $DESTDIR/usr/lib/pkgconfig/libxslt.pc \ + $DESTDIR/usr/lib/pkgconfig/libexslt.pc \ + $DESTDIR/usr/lib/xsltConf.sh + fi vlicense COPYING } @@ -56,7 +64,6 @@ libxslt-devel_package() { libxslt-python_package() { lib32disabled=yes short_desc+=" - python extension" - pycompile_module="libxslt.py" pkg_install() { vmove "usr/lib/python*" vmove usr/share/doc/${sourcepkg}-python-${version} From fbe6fee9ab5e2a0095b6568dfa1d69ab970f4aac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 19 May 2020 21:55:50 +0700 Subject: [PATCH 2/4] xmlsec1: remove $XBPS_CROSS_BASE reference from pkg-config Partial-fixes: #19642 --- common/shlibs | 1 + srcpkgs/xmlsec1/template | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/shlibs b/common/shlibs index 962143cc7cd..f383e858f78 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1503,6 +1503,7 @@ libaqebics.so.0 aqbanking-5.0.25_1 libaqbankingpp.so.0 aqbanking-5.0.25_1 libxmlsec1.so.1 xmlsec1-1.2.19_1 libxmlsec1-nss.so.1 xmlsec1-1.2.28_2 +libxmlsec1-openssl.so.1 xmlsec1-1.2.30_1 libcheck.so.0 check-0.9.12_1 liblxc.so.1 liblxc-1.0.0_1 libtcmalloc.so.4 gperftools-2.1_1 diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template index 1f28d8c0803..ebb2e7ab878 100644 --- a/srcpkgs/xmlsec1/template +++ b/srcpkgs/xmlsec1/template @@ -1,7 +1,7 @@ # Template file for 'xmlsec1' pkgname=xmlsec1 version=1.2.30 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake libtool pkg-config gnutls-devel" makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel @@ -19,7 +19,10 @@ pre_configure() { post_install() { if [ "$CROSS_BUILD" ]; then - vsed -e "s,${XBPS_CROSS_BASE},,g" -i ${DESTDIR}/usr/lib/xmlsec1Conf.sh + vsed -e "s,${XBPS_CROSS_BASE},,g" -i \ + $DESTDIR/usr/bin/xmlsec1-config \ + $DESTDIR/usr/lib/pkgconfig/xmlsec1-gnutls.pc \ + $DESTDIR/usr/lib/xmlsec1Conf.sh fi vlicense COPYING From eb7a6e7abeb68b3cf569d4d7202800105af03f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 20 May 2020 07:07:07 +0700 Subject: [PATCH 3/4] post-install: clean reference to $XBPS_CROSS_BASE in pkgconfig --- ...13-pkg-config-clean-xbps-cross-base-ref.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh 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 new file mode 100644 index 00000000000..86a599b5ec3 --- /dev/null +++ b/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# +# This hook removes reference to $XBPS_CROSS_BASE in +# /usr/{lib,share}/pkgconfig/*.pc + +if [ -z "$CROSS_BUILD" ]; then + return 0 +fi +for f in "$PKGDESTDIR"/usr/lib/pkgconfig/*.pc \ + "$PKGDESTDIR"/usr/share/pkgconfig/*.pc +do + if [ -f "$f" ]; then + # Sample sed script + # s,/usr/armv7l-linux-musleabihf/,/,g + # trailing / to avoid clashing with other $XBPS_CROSS_BASE and + # $XBPS_CROSS_TRIPLET reference. + sed -i -e "s,$XBPS_CROSS_BASE/,/,g" "$f" + fi +done From 3a73ebbaeaec04a8a11a5212c70853c180887283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 20 May 2020 08:03:02 +0700 Subject: [PATCH 4/4] coin3: remove $XBPS_CROSS_BASE cruft --- srcpkgs/coin3/template | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/srcpkgs/coin3/template b/srcpkgs/coin3/template index e009eebc97f..4150c863e9f 100644 --- a/srcpkgs/coin3/template +++ b/srcpkgs/coin3/template @@ -1,7 +1,7 @@ # Template file for 'coin3' pkgname=coin3 version=3.1.3 -revision=4 +revision=5 wrksrc="Coin-${version}" build_style=gnu-configure configure_args="--includedir=/usr/include/Coin3 --disable-dependency-tracking @@ -44,6 +44,14 @@ post_configure() { esac } +post_install() { + if [ "$CROSS_BUILD" ]; then + sed -i -e "s,$XBPS_CROSS_BASE,,g" \ + $DESTDIR/usr/share/Coin/conf/coin-default.cfg \ + $DESTDIR/usr/lib/pkgconfig/Coin.pc + fi +} + coin3-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}"