diff --git a/testing/nauty/APKBUILD b/testing/nauty/APKBUILD index 1e65a786102..9b44e861cc9 100644 --- a/testing/nauty/APKBUILD +++ b/testing/nauty/APKBUILD @@ -1,25 +1,30 @@ # Contributor: Grigory Kirillov -# Maintainer: +# Maintainer: Celeste pkgname=nauty -pkgver=2.8.8 +pkgver=2.8.9 _pkgver=${pkgver//./_} pkgrel=0 pkgdesc="Programs for computing automorphism groups of graphs and digraphs" url="https://pallini.di.uniroma1.it/" arch="all" license="Apache-2.0" -subpackages="$pkgname-dev" -source="https://pallini.di.uniroma1.it/nauty$_pkgver.tar.gz" +subpackages="$pkgname-dev $pkgname-libs" +source="https://pallini.di.uniroma1.it/nauty$_pkgver.tar.gz + fix-test-uniqg.patch + " builddir="$srcdir/$pkgname$_pkgver" build() { export CFLAGS="${CFLAGS/-Os/-O3}" # gotta go fast ./configure \ - --target="$CTARGET" \ - --build="$CBUILD" \ - --host="$CHOST" \ + --target=$CTARGET \ + --build=$CBUILD \ + --host=$CHOST \ --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ --enable-generic make } @@ -29,9 +34,16 @@ check() { } package() { - make DESTDIR="$pkgdir" pkgconfigexecdir=/usr/lib/pkgconfig install + make DESTDIR="$pkgdir" install +} + +libs() { + default_libs + + amove usr/lib/libnauty*-*.*.so } sha512sums=" -c0495256b92b0742e7f0a3ad8b43f400e7b4bc4b58dff560e7d0a868f392b0462424566b8ebba5ec08499551eab091b6a8e2c0ddba4953ab7592906034812c18 nauty2_8_8.tar.gz +4310747ae357d11547f9c9b45329775ffa2cedbff4bb4f9b12fb7b577c9e7c15e3f3c5279d3de145f2a1c3f8c727b1d9507a644093d1cbe58a93eb7b1436d8ee nauty2_8_9.tar.gz +616419a1240bcdcc4df8fef8e368a03583594bf84db6bd2894a1b851216f24cfeb82429ddb6ca4229edfe67d5719770ef0a0e3cd17c3780f8d1f807a016f4d5b fix-test-uniqg.patch " diff --git a/testing/nauty/fix-test-uniqg.patch b/testing/nauty/fix-test-uniqg.patch new file mode 100644 index 00000000000..bcc3371d8c1 --- /dev/null +++ b/testing/nauty/fix-test-uniqg.patch @@ -0,0 +1,22 @@ +--- a/runalltests ++++ b/runalltests +@@ -121,7 +121,7 @@ + runonetest "./geng -q -TD6 10 | ./ransubg -qS765 -P9/10 | ./countg --NN,A,G,GG" "" nautestv.ans + runonetest "./genrang -q -P3 -S1234 70 1000 | ./countg --G,GG" "" nautestw.ans + runonetest "./genrang -q -P4 -z -S1234 70 500 | ./countg --G,GG" "" nautestx.ans +-runonetest "./geng -q -bT 12 | ./ranlabg -qS7654 -m5 | uniqg -u" "" nautesty.ans ++runonetest "./geng -q -bT 12 | ./ranlabg -qS7654 -m5 | ./uniqg -u" "" nautesty.ans + + echo " " + +--- a/runalltests.in ++++ b/runalltests.in +@@ -121,7 +121,7 @@ + runonetest "./geng -q -TD6 10 | ./ransubg -qS765 -P9/10 | ./countg --NN,A,G,GG" "" nautestv.ans + runonetest "./genrang -q -P3 -S1234 70 1000 | ./countg --G,GG" "" nautestw.ans + runonetest "./genrang -q -P4 -z -S1234 70 500 | ./countg --G,GG" "" nautestx.ans +-runonetest "./geng -q -bT 12 | ./ranlabg -qS7654 -m5 | uniqg -u" "" nautesty.ans ++runonetest "./geng -q -bT 12 | ./ranlabg -qS7654 -m5 | ./uniqg -u" "" nautesty.ans + + echo " " +