* Re: [PR PATCH] [Updated] xbps-src: hook to remove & warn cross cruft
2020-05-23 5:40 [PR PATCH] xbps-src: hook to remove & warn cross cruft sgn
@ 2020-05-23 6:16 ` sgn
2020-05-23 7:33 ` sgn
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-05-23 6:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 347 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages remove-cross-cruft
https://github.com/void-linux/void-packages/pull/22218
xbps-src: hook to remove & warn cross cruft
See #22139
A patch file from https://github.com/void-linux/void-packages/pull/22218.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-cross-cruft-22218.patch --]
[-- Type: text/x-diff, Size: 5542 bytes --]
From 6f72224b506f324e1e41a2988e3c197775deef61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 07:07:07 +0700
Subject: [PATCH 1/5] post-install: clean reference to $XBPS_CROSS_BASE in
pkgconfig
---
...13-pkg-config-clean-xbps-cross-base-ref.sh | 22 +++++++++++++++++++
1 file changed, 22 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..998c1917abd
--- /dev/null
+++ b/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh
@@ -0,0 +1,22 @@
+# This hook removes reference to $XBPS_CROSS_BASE in
+# /usr/{lib,share}/pkgconfig/*.pc
+#
+# We don't touch /usr/bin/*-config since there're other information that
+# references $XBPS_CROSS_BASE
+
+hook() {
+ 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 ef5eb55af98458cafaad5d3cadbd0aa996d47d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 12:29:12 +0700
Subject: [PATCH 2/5] post-install: warn if cross wrapper not cleared
---
.../99-pkglint-warn-cross-cruft.sh | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
diff --git a/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh b/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
new file mode 100644
index 00000000000..16e6c5ff656
--- /dev/null
+++ b/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
@@ -0,0 +1,21 @@
+# This hook warns if :
+# - Any text file /usr/{bin,lib,libexec,share} contains $XBPS_CROSS_BASE
+# - Any text file /usr/{bin,lib,libexec,share} contains $XBPS_WRAPPERDIR
+
+hook() {
+ if [ -z "$CROSS_BUILD" ]; then
+ return 0
+ fi
+ for d in bin lib libexec share; do
+ for f in $PKGDESTDIR/usr/$d/* $PKGDESTDIR/usr/$d/**/*; do
+ case "$(file -bi "$f")" in
+ text/*) if grep -q -e "$XBPS_CROSS_BASE" \
+ -e "$XBPS_WRAPPERDIR" "$f"; then
+ msg_warn "${f#$PKGDESTDIR} has cross cruft\n"
+ fi
+ ;;
+ esac
+ done
+ done
+ return 0;
+}
From 8b83b0bd13d12a897466d878c57b918fac5fc4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 08:03:02 +0700
Subject: [PATCH 3/5] 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}"
From f0db6c1de2b59a37e48416c2a53ccb462d774a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 11:44:07 +0700
Subject: [PATCH 4/5] serf: revbump to remove XBPS_CROSS_BASE
[ci skip]
---
srcpkgs/serf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index de6101439df..6fdcf782458 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,7 +1,7 @@
# Template file for 'serf'
pkgname=serf
version=1.3.9
-revision=10
+revision=11
build_style=scons
make_build_args="PREFIX=/usr"
hostmakedepends="libressl-devel"
From 29e1052b30b5a17de945dc7592bc55102a6d22d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 12:43:20 +0700
Subject: [PATCH 5/5] ncurses: remove $XBPS_CROSS_BASE
[ci skip]
---
srcpkgs/ncurses/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 2e346236043..b7c30b07344 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
# Template file for 'ncurses'
pkgname=ncurses
version=6.2
-revision=1
+revision=2
bootstrap=yes
configure_args="--enable-big-core"
short_desc="System V Release 4.0 curses emulation library"
@@ -90,6 +90,10 @@ do_install() {
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncursesw5-config
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncurses5-config
+
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s,-L$XBPS_CROSS_BASE,-L,g" ${DESTDIR}/usr/bin/ncursesw6-config
+ fi
}
ncurses-libs_package() {
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] xbps-src: hook to remove & warn cross cruft
2020-05-23 5:40 [PR PATCH] xbps-src: hook to remove & warn cross cruft sgn
2020-05-23 6:16 ` [PR PATCH] [Updated] " sgn
@ 2020-05-23 7:33 ` sgn
2020-05-23 7:54 ` sgn
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-05-23 7:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages remove-cross-cruft
https://github.com/void-linux/void-packages/pull/22218
xbps-src: hook to remove & warn cross cruft
See #22139
(I'll add as much as possible packages, but this PR can be merged as is)
A patch file from https://github.com/void-linux/void-packages/pull/22218.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-cross-cruft-22218.patch --]
[-- Type: text/x-diff, Size: 6569 bytes --]
From 6f72224b506f324e1e41a2988e3c197775deef61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 07:07:07 +0700
Subject: [PATCH 1/6] post-install: clean reference to $XBPS_CROSS_BASE in
pkgconfig
---
...13-pkg-config-clean-xbps-cross-base-ref.sh | 22 +++++++++++++++++++
1 file changed, 22 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..998c1917abd
--- /dev/null
+++ b/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh
@@ -0,0 +1,22 @@
+# This hook removes reference to $XBPS_CROSS_BASE in
+# /usr/{lib,share}/pkgconfig/*.pc
+#
+# We don't touch /usr/bin/*-config since there're other information that
+# references $XBPS_CROSS_BASE
+
+hook() {
+ 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 ef5eb55af98458cafaad5d3cadbd0aa996d47d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 12:29:12 +0700
Subject: [PATCH 2/6] post-install: warn if cross wrapper not cleared
---
.../99-pkglint-warn-cross-cruft.sh | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
diff --git a/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh b/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
new file mode 100644
index 00000000000..16e6c5ff656
--- /dev/null
+++ b/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
@@ -0,0 +1,21 @@
+# This hook warns if :
+# - Any text file /usr/{bin,lib,libexec,share} contains $XBPS_CROSS_BASE
+# - Any text file /usr/{bin,lib,libexec,share} contains $XBPS_WRAPPERDIR
+
+hook() {
+ if [ -z "$CROSS_BUILD" ]; then
+ return 0
+ fi
+ for d in bin lib libexec share; do
+ for f in $PKGDESTDIR/usr/$d/* $PKGDESTDIR/usr/$d/**/*; do
+ case "$(file -bi "$f")" in
+ text/*) if grep -q -e "$XBPS_CROSS_BASE" \
+ -e "$XBPS_WRAPPERDIR" "$f"; then
+ msg_warn "${f#$PKGDESTDIR} has cross cruft\n"
+ fi
+ ;;
+ esac
+ done
+ done
+ return 0;
+}
From 8b83b0bd13d12a897466d878c57b918fac5fc4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 08:03:02 +0700
Subject: [PATCH 3/6] 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}"
From f0db6c1de2b59a37e48416c2a53ccb462d774a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 11:44:07 +0700
Subject: [PATCH 4/6] serf: revbump to remove XBPS_CROSS_BASE
[ci skip]
---
srcpkgs/serf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index de6101439df..6fdcf782458 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,7 +1,7 @@
# Template file for 'serf'
pkgname=serf
version=1.3.9
-revision=10
+revision=11
build_style=scons
make_build_args="PREFIX=/usr"
hostmakedepends="libressl-devel"
From 29e1052b30b5a17de945dc7592bc55102a6d22d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 12:43:20 +0700
Subject: [PATCH 5/6] ncurses: remove $XBPS_CROSS_BASE
[ci skip]
---
srcpkgs/ncurses/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 2e346236043..b7c30b07344 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
# Template file for 'ncurses'
pkgname=ncurses
version=6.2
-revision=1
+revision=2
bootstrap=yes
configure_args="--enable-big-core"
short_desc="System V Release 4.0 curses emulation library"
@@ -90,6 +90,10 @@ do_install() {
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncursesw5-config
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncurses5-config
+
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s,-L$XBPS_CROSS_BASE,-L,g" ${DESTDIR}/usr/bin/ncursesw6-config
+ fi
}
ncurses-libs_package() {
From 2067808c169ee51b75d0df0065748d36ab9997e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 14:23:27 +0700
Subject: [PATCH 6/6] ImageMagick: remove $XBPS_WRAPPERDIR cruft
[ci skip]
---
srcpkgs/ImageMagick/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 08275b47ce4..10f1467ebd1 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -3,7 +3,7 @@ pkgname=ImageMagick
_majorver=7.0.10
_patchver=12
version="${_majorver}.${_patchver}"
-revision=1
+revision=2
wrksrc="${pkgname}-${_majorver}-${_patchver}"
build_style=gnu-configure
configure_args="--without-autotrace --with-wmf=yes
@@ -47,6 +47,10 @@ do_check() {
}
post_install() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i -e "s,$XBPS_WRAPPERDIR/$XBPS_CROSS_TRIPLET-,,g" \
+ $DESTDIR/usr/bin/*-config
+ fi
vlicense LICENSE
vlicense NOTICE
}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] xbps-src: hook to remove & warn cross cruft
2020-05-23 5:40 [PR PATCH] xbps-src: hook to remove & warn cross cruft sgn
2020-05-23 6:16 ` [PR PATCH] [Updated] " sgn
2020-05-23 7:33 ` sgn
@ 2020-05-23 7:54 ` sgn
2020-05-23 8:08 ` sgn
2020-05-31 2:10 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-05-23 7:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages remove-cross-cruft
https://github.com/void-linux/void-packages/pull/22218
xbps-src: hook to remove & warn cross cruft
See #22139
(I'll add as much as possible packages, but this PR can be merged as is)
A patch file from https://github.com/void-linux/void-packages/pull/22218.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-cross-cruft-22218.patch --]
[-- Type: text/x-diff, Size: 6574 bytes --]
From c591ce4625519d9eb139651b00dde7027434234e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 07:07:07 +0700
Subject: [PATCH 1/6] post-install: clean reference to $XBPS_CROSS_BASE in
pkgconfig
---
...13-pkg-config-clean-xbps-cross-base-ref.sh | 22 +++++++++++++++++++
1 file changed, 22 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..5cdfb0e9bfd
--- /dev/null
+++ b/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh
@@ -0,0 +1,22 @@
+# This hook removes reference to $XBPS_CROSS_BASE in
+# /usr/{lib,share}/pkgconfig/*.pc
+#
+# We don't touch /usr/bin/*-config since there're other information that
+# references $XBPS_CROSS_BASE
+
+hook() {
+ 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/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"
+ fi
+ done
+}
From af695acb0976a49bc9a271c345417dafdd1f58a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 12:29:12 +0700
Subject: [PATCH 2/6] post-install: warn if cross wrapper not cleared
---
.../99-pkglint-warn-cross-cruft.sh | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
diff --git a/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh b/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
new file mode 100644
index 00000000000..16e6c5ff656
--- /dev/null
+++ b/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
@@ -0,0 +1,21 @@
+# This hook warns if :
+# - Any text file /usr/{bin,lib,libexec,share} contains $XBPS_CROSS_BASE
+# - Any text file /usr/{bin,lib,libexec,share} contains $XBPS_WRAPPERDIR
+
+hook() {
+ if [ -z "$CROSS_BUILD" ]; then
+ return 0
+ fi
+ for d in bin lib libexec share; do
+ for f in $PKGDESTDIR/usr/$d/* $PKGDESTDIR/usr/$d/**/*; do
+ case "$(file -bi "$f")" in
+ text/*) if grep -q -e "$XBPS_CROSS_BASE" \
+ -e "$XBPS_WRAPPERDIR" "$f"; then
+ msg_warn "${f#$PKGDESTDIR} has cross cruft\n"
+ fi
+ ;;
+ esac
+ done
+ done
+ return 0;
+}
From 114ead39f9a42622f65d8faa679d6fa701900f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 08:03:02 +0700
Subject: [PATCH 3/6] 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}"
From 07e8864fce85f2ac2a08a07c0a4dd21c9d1872d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 11:44:07 +0700
Subject: [PATCH 4/6] serf: revbump to remove XBPS_CROSS_BASE
[ci skip]
---
srcpkgs/serf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index de6101439df..6fdcf782458 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,7 +1,7 @@
# Template file for 'serf'
pkgname=serf
version=1.3.9
-revision=10
+revision=11
build_style=scons
make_build_args="PREFIX=/usr"
hostmakedepends="libressl-devel"
From bb57169faedd835f1ff80f318d995948efdc1b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 12:43:20 +0700
Subject: [PATCH 5/6] ncurses: remove $XBPS_CROSS_BASE
[ci skip]
---
srcpkgs/ncurses/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 2e346236043..b7c30b07344 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
# Template file for 'ncurses'
pkgname=ncurses
version=6.2
-revision=1
+revision=2
bootstrap=yes
configure_args="--enable-big-core"
short_desc="System V Release 4.0 curses emulation library"
@@ -90,6 +90,10 @@ do_install() {
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncursesw5-config
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncurses5-config
+
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s,-L$XBPS_CROSS_BASE,-L,g" ${DESTDIR}/usr/bin/ncursesw6-config
+ fi
}
ncurses-libs_package() {
From 10cd48e41ec66552e93192a111ddbdbade6aa624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 14:23:27 +0700
Subject: [PATCH 6/6] ImageMagick: remove $XBPS_WRAPPERDIR cruft
[ci skip]
---
srcpkgs/ImageMagick/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 08275b47ce4..10f1467ebd1 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -3,7 +3,7 @@ pkgname=ImageMagick
_majorver=7.0.10
_patchver=12
version="${_majorver}.${_patchver}"
-revision=1
+revision=2
wrksrc="${pkgname}-${_majorver}-${_patchver}"
build_style=gnu-configure
configure_args="--without-autotrace --with-wmf=yes
@@ -47,6 +47,10 @@ do_check() {
}
post_install() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i -e "s,$XBPS_WRAPPERDIR/$XBPS_CROSS_TRIPLET-,,g" \
+ $DESTDIR/usr/bin/*-config
+ fi
vlicense LICENSE
vlicense NOTICE
}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Updated] xbps-src: hook to remove & warn cross cruft
2020-05-23 5:40 [PR PATCH] xbps-src: hook to remove & warn cross cruft sgn
` (2 preceding siblings ...)
2020-05-23 7:54 ` sgn
@ 2020-05-23 8:08 ` sgn
2020-05-31 2:10 ` [PR PATCH] [Merged]: " sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-05-23 8:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 423 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages remove-cross-cruft
https://github.com/void-linux/void-packages/pull/22218
xbps-src: hook to remove & warn cross cruft
See #22139
(I'll add as much as possible packages, but this PR can be merged as is)
A patch file from https://github.com/void-linux/void-packages/pull/22218.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-cross-cruft-22218.patch --]
[-- Type: text/x-diff, Size: 7845 bytes --]
From c591ce4625519d9eb139651b00dde7027434234e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 07:07:07 +0700
Subject: [PATCH 1/7] post-install: clean reference to $XBPS_CROSS_BASE in
pkgconfig
---
...13-pkg-config-clean-xbps-cross-base-ref.sh | 22 +++++++++++++++++++
1 file changed, 22 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..5cdfb0e9bfd
--- /dev/null
+++ b/common/hooks/post-install/13-pkg-config-clean-xbps-cross-base-ref.sh
@@ -0,0 +1,22 @@
+# This hook removes reference to $XBPS_CROSS_BASE in
+# /usr/{lib,share}/pkgconfig/*.pc
+#
+# We don't touch /usr/bin/*-config since there're other information that
+# references $XBPS_CROSS_BASE
+
+hook() {
+ 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/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"
+ fi
+ done
+}
From af695acb0976a49bc9a271c345417dafdd1f58a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 12:29:12 +0700
Subject: [PATCH 2/7] post-install: warn if cross wrapper not cleared
---
.../99-pkglint-warn-cross-cruft.sh | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
diff --git a/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh b/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
new file mode 100644
index 00000000000..16e6c5ff656
--- /dev/null
+++ b/common/hooks/post-install/99-pkglint-warn-cross-cruft.sh
@@ -0,0 +1,21 @@
+# This hook warns if :
+# - Any text file /usr/{bin,lib,libexec,share} contains $XBPS_CROSS_BASE
+# - Any text file /usr/{bin,lib,libexec,share} contains $XBPS_WRAPPERDIR
+
+hook() {
+ if [ -z "$CROSS_BUILD" ]; then
+ return 0
+ fi
+ for d in bin lib libexec share; do
+ for f in $PKGDESTDIR/usr/$d/* $PKGDESTDIR/usr/$d/**/*; do
+ case "$(file -bi "$f")" in
+ text/*) if grep -q -e "$XBPS_CROSS_BASE" \
+ -e "$XBPS_WRAPPERDIR" "$f"; then
+ msg_warn "${f#$PKGDESTDIR} has cross cruft\n"
+ fi
+ ;;
+ esac
+ done
+ done
+ return 0;
+}
From 114ead39f9a42622f65d8faa679d6fa701900f44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Wed, 20 May 2020 08:03:02 +0700
Subject: [PATCH 3/7] 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}"
From 07e8864fce85f2ac2a08a07c0a4dd21c9d1872d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 11:44:07 +0700
Subject: [PATCH 4/7] serf: revbump to remove XBPS_CROSS_BASE
[ci skip]
---
srcpkgs/serf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template
index de6101439df..6fdcf782458 100644
--- a/srcpkgs/serf/template
+++ b/srcpkgs/serf/template
@@ -1,7 +1,7 @@
# Template file for 'serf'
pkgname=serf
version=1.3.9
-revision=10
+revision=11
build_style=scons
make_build_args="PREFIX=/usr"
hostmakedepends="libressl-devel"
From bb57169faedd835f1ff80f318d995948efdc1b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 12:43:20 +0700
Subject: [PATCH 5/7] ncurses: remove $XBPS_CROSS_BASE
[ci skip]
---
srcpkgs/ncurses/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 2e346236043..b7c30b07344 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
# Template file for 'ncurses'
pkgname=ncurses
version=6.2
-revision=1
+revision=2
bootstrap=yes
configure_args="--enable-big-core"
short_desc="System V Release 4.0 curses emulation library"
@@ -90,6 +90,10 @@ do_install() {
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncursesw5-config
ln -sf ncursesw6-config ${DESTDIR}/usr/bin/ncurses5-config
+
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s,-L$XBPS_CROSS_BASE,-L,g" ${DESTDIR}/usr/bin/ncursesw6-config
+ fi
}
ncurses-libs_package() {
From 10cd48e41ec66552e93192a111ddbdbade6aa624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 14:23:27 +0700
Subject: [PATCH 6/7] ImageMagick: remove $XBPS_WRAPPERDIR cruft
[ci skip]
---
srcpkgs/ImageMagick/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template
index 08275b47ce4..10f1467ebd1 100644
--- a/srcpkgs/ImageMagick/template
+++ b/srcpkgs/ImageMagick/template
@@ -3,7 +3,7 @@ pkgname=ImageMagick
_majorver=7.0.10
_patchver=12
version="${_majorver}.${_patchver}"
-revision=1
+revision=2
wrksrc="${pkgname}-${_majorver}-${_patchver}"
build_style=gnu-configure
configure_args="--without-autotrace --with-wmf=yes
@@ -47,6 +47,10 @@ do_check() {
}
post_install() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i -e "s,$XBPS_WRAPPERDIR/$XBPS_CROSS_TRIPLET-,,g" \
+ $DESTDIR/usr/bin/*-config
+ fi
vlicense LICENSE
vlicense NOTICE
}
From a327e0e4e74815bb9979cb75af10b7b95715ca75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 23 May 2020 15:07:39 +0700
Subject: [PATCH 7/7] libotf: remove $XBPS_CROSS_BASE cruft
[ci skip]
---
srcpkgs/libotf/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libotf/template b/srcpkgs/libotf/template
index 7b5e3b84eb1..30ec1ec56e2 100644
--- a/srcpkgs/libotf/template
+++ b/srcpkgs/libotf/template
@@ -4,13 +4,19 @@ version=0.9.16
revision=1
build_style=gnu-configure
makedepends="libXaw-devel freetype-devel"
-short_desc="A Library for handling OpenType Font"
+short_desc="Library for handling OpenType Font"
maintainer="Kazuho Sakoda <hyonhyoro.kazuho@gmail.com>"
license="LGPL-2.1"
homepage="http://www.nongnu.org/m17n/"
distfiles="${NONGNU_SITE}/m17n/${pkgname}-${version}.tar.gz"
checksum=68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b
+post_install() {
+ vsed -i -e "s,$XBPS_CROSS_BASE/usr,/usr,g" \
+ "$DESTDIR/usr/bin/libotf-config" \
+ "$DESTDIR/usr/lib/pkgconfig/libotf.pc"
+}
+
libotf-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PR PATCH] [Merged]: xbps-src: hook to remove & warn cross cruft
2020-05-23 5:40 [PR PATCH] xbps-src: hook to remove & warn cross cruft sgn
` (3 preceding siblings ...)
2020-05-23 8:08 ` sgn
@ 2020-05-31 2:10 ` sgn
4 siblings, 0 replies; 6+ messages in thread
From: sgn @ 2020-05-31 2:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
There's a merged pull request on the void-packages repository
xbps-src: hook to remove & warn cross cruft
https://github.com/void-linux/void-packages/pull/22218
Description:
See #22139
(I'll add as much as possible packages, but this PR can be merged as is)
I'll merge this if nobody complains by 2020-05-30
^ permalink raw reply [flat|nested] 6+ messages in thread