diff options
Diffstat (limited to 'system/libtool')
| -rw-r--r-- | system/libtool/APKBUILD | 32 | ||||
| -rw-r--r-- | system/libtool/fix-test-grep-expression.patch | 17 | ||||
| -rw-r--r-- | system/libtool/gnulib-tests-dont-require-gpg-passphrase.patch | 10 |
3 files changed, 44 insertions, 15 deletions
diff --git a/system/libtool/APKBUILD b/system/libtool/APKBUILD index c4a3348f9..5d8b85716 100644 --- a/system/libtool/APKBUILD +++ b/system/libtool/APKBUILD @@ -1,7 +1,7 @@ -# Maintainer: +# Maintainer: Zach van Rijn <me@zv.io> pkgname=libtool -pkgver=2.4.6 -pkgrel=6 +pkgver=2.4.7 +pkgrel=1 pkgdesc="A generic library support script" arch="all" license="GPL-2.0+" @@ -12,10 +12,12 @@ checkdepends="autoconf automake gzip" subpackages="libltdl $pkgname-doc" options="libtool" source="https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.gz - libtool-fix-cross-compile.patch" + libtool-fix-cross-compile.patch + fix-test-grep-expression.patch + gnulib-tests-dont-require-gpg-passphrase.patch + " build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,16 +27,14 @@ build() { make } -package() { - cd "$builddir" - make DESTDIR="$pkgdir" install +check() { + # Test 70 and 116 are known to fail + # Test 169 repeats the entire test suite with shorter max_cmd_len + make check TESTSUITEFLAGS="1-69 71-115 117-168" } -check() { - cd "$builddir" - # Test 70 and 117 are known to fail - # Test 170 repeats the entire test suite with shorter max_cmd_len - make check TESTSUITEFLAGS="1-69 71-116 118-169" +package() { + make DESTDIR="$pkgdir" install } libltdl() { @@ -45,5 +45,7 @@ libltdl() { mv "$pkgdir/usr/lib/libltdl.so"* "$subpkgdir/usr/lib/" } -sha512sums="3233d81cb2739a54b840a0a82064eebbfaa4fb442fb993a35d6bd41d8395c51f038c90ae048b9252f172d0a5bbfb4b36e2b13d4477001f9ff7d4124237819a18 libtool-2.4.6.tar.gz -aa14cadd70a633520249fa3a6a4c45b309a980380e62dd5982b3ae842c478a77401ad809297fceebd167c167b0a19f380e6a6c295bc75d1029d56d3bf262b209 libtool-fix-cross-compile.patch" +sha512sums="27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385 libtool-2.4.7.tar.gz +aa14cadd70a633520249fa3a6a4c45b309a980380e62dd5982b3ae842c478a77401ad809297fceebd167c167b0a19f380e6a6c295bc75d1029d56d3bf262b209 libtool-fix-cross-compile.patch +57d47955bd3d51c5df2d62ba4773687e9111bfc155312eaa10d84e273845e255c2e62a1ceb01e8ce35617cb702f116fc223121dbb69955f5141c0185fbf4b6b4 fix-test-grep-expression.patch +0d5364fd652e2e65a5f9a7c4c54755863bf2e68a7000a28cc8acf78e2342592d12444ff71dd2b755e4a3a2ef18a9757a029a25dfcf34b3e277bbfa351abe0575 gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/system/libtool/fix-test-grep-expression.patch b/system/libtool/fix-test-grep-expression.patch new file mode 100644 index 000000000..6a78c0b7a --- /dev/null +++ b/system/libtool/fix-test-grep-expression.patch @@ -0,0 +1,17 @@ +--- a/tests/link-order.at ++++ b/tests/link-order.at +@@ -99,12 +99,12 @@ + case $hardcode_direct$hardcode_direct_absolute in + yesno) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " .*\/new\/lib/libb$shared_ext .*\/old\/lib/libcee$shared_ext" stdout ++ $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + *) + AT_CHECK([if $EGREP relinking stderr; then +- $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout ++ $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout + else :; fi], [0], [ignore], [], [echo "wrong link order"]) + ;; + esac diff --git a/system/libtool/gnulib-tests-dont-require-gpg-passphrase.patch b/system/libtool/gnulib-tests-dont-require-gpg-passphrase.patch new file mode 100644 index 000000000..c3267b159 --- /dev/null +++ b/system/libtool/gnulib-tests-dont-require-gpg-passphrase.patch @@ -0,0 +1,10 @@ +--- libtool-2.4.7/gnulib-tests/test-vc-list-files-git.sh.old 2018-01-03 18:36:29.000000000 -0600 ++++ libtool-2.4.7/gnulib-tests/test-vc-list-files-git.sh 2018-06-18 21:57:08.305562148 -0500 +@@ -32,6 +32,7 @@ + touch d/a b c && + git config user.email "you@example.com" && + git config user.name "Your Name" && ++ git config commit.gpgsign false && + git add . > /dev/null && + git commit -q -a -m log && + printf '%s\n' b c d/a > expected && |