diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2025-05-27 02:22:43 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2025-05-27 02:22:43 -0500 |
| commit | b068788aef5d32875d3312a38a421b9a2952801f (patch) | |
| tree | cf5fa920dd337d35f51ebe41475be2c44c4c063f | |
| parent | b2ec38f40e1943a3dda3a1a0fb90522242f92f45 (diff) | |
| download | packages-b068788aef5d32875d3312a38a421b9a2952801f.tar.gz packages-b068788aef5d32875d3312a38a421b9a2952801f.tar.bz2 packages-b068788aef5d32875d3312a38a421b9a2952801f.tar.xz packages-b068788aef5d32875d3312a38a421b9a2952801f.zip | |
system/findutils: Update to 4.10.0
The tests are underlinked in the release tarball, so bring in patch
from findutils Git that fixes the build error.
| -rw-r--r-- | system/findutils/APKBUILD | 13 | ||||
| -rw-r--r-- | system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch | 2 | ||||
| -rw-r--r-- | system/findutils/tests-underlinked.patch | 27 |
3 files changed, 36 insertions, 6 deletions
diff --git a/system/findutils/APKBUILD b/system/findutils/APKBUILD index 70fce5e9d..fc32807dd 100644 --- a/system/findutils/APKBUILD +++ b/system/findutils/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: Zach van Rijn <me@zv.io> pkgname=findutils -pkgver=4.9.0 +pkgver=4.10.0 pkgrel=0 pkgdesc="GNU utilities to locate files" url="https://www.gnu.org/software/findutils/" @@ -10,14 +10,16 @@ arch="all" license="GPL-3.0+" depends="" checkdepends="coreutils diffutils dejagnu" -makedepends="" +makedepends="autoconf automake" subpackages="$pkgname-doc $pkgname-lang" source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz gnulib-tests-dont-require-gpg-passphrase.patch sysmacros.patch + tests-underlinked.patch " build() { + autoreconf -vi ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -41,6 +43,7 @@ package() { rm -rf "$pkgdir"/usr/lib } -sha512sums="ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9 findutils-4.9.0.tar.xz -dc7e9c4fdd36d05ca230e3456a8005a5fcd353db07181e0d17ab66db4eb967e6bdfe3b6f1da0edbb38e973fea89ae174ea31e6839f59d3084b15f08de363f139 gnulib-tests-dont-require-gpg-passphrase.patch -2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487 sysmacros.patch" +sha512sums="b8b683d21cd26c6da4f41c56e83cadbda4780f8610a2bbd4b4e34bb1f339c3209721974b03e076d5eef0331fd876d947b398197aad37c29bbcc2e0405c641b34 findutils-4.10.0.tar.xz +e3687fdacf174b66d4c8a3f696b545bdccd7f47f0462358d216442693edf9b505c80ab4c6407ade264aa27fd1ea783d08ca38b2f87c04e4eb0abc706eb4ec262 gnulib-tests-dont-require-gpg-passphrase.patch +2e214511de4be47dc0df46a83d4102e4b59b5f02c4b8356a1ed0b26d481e17c6604bbf07071960f219ef85e1687878cce69a8be28c46638ee4ebe9f4ce0ed487 sysmacros.patch +10bed9471bf59bde74a26607a38d74719821022e97db934db62efb39d21ae646dfb61dd890fb0665c7f7b184634be94a2b1758f7f49a127257b0a48a8b3bb9b3 tests-underlinked.patch" diff --git a/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch b/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch index 46b921ff9..b77b89513 100644 --- a/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch +++ b/system/findutils/gnulib-tests-dont-require-gpg-passphrase.patch @@ -1,6 +1,6 @@ --- findutils-4.6.0/gnulib-tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600 +++ findutils-4.6.0/gnulib-tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 -@@ -32,6 +32,7 @@ +@@ -39,6 +39,7 @@ touch d/a b c && git config user.email "you@example.com" && git config user.name "Your Name" && diff --git a/system/findutils/tests-underlinked.patch b/system/findutils/tests-underlinked.patch new file mode 100644 index 000000000..d45f6a7a2 --- /dev/null +++ b/system/findutils/tests-underlinked.patch @@ -0,0 +1,27 @@ +From 85fc8966e5912390ad220d03b188dd319c85ed1e Mon Sep 17 00:00:00 2001 +From: Collin Funk <collin.funk1@gmail.com> +Date: Mon, 24 Jun 2024 00:33:30 -0700 +Subject: [PATCH] tests: link binaries to gnulib + +* tests/local.mk (AM_CPPFLAGS): Include gnulib headers. +(LDADD): Link to gnulib. + +Copyright-paperwork-exempt: Yes +--- + tests/local.mk | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/local.mk b/tests/local.mk +index 1fe14c01..83862119 100644 +--- a/tests/local.mk ++++ b/tests/local.mk +@@ -17,6 +17,9 @@ + + built_programs = find xargs frcode locate updatedb + ++AM_CPPFLAGS = -I$(top_srcdir)/gl/lib ++LDADD = $(top_srcdir)/gl/lib/libgnulib.a ++ + # Indirections required so that we'll still be able to know the + # complete list of our tests even if the user overrides TESTS + # from the command line (as permitted by the test harness API). |