From 2027c709e0ffc06f2e20660dce7100a0443ca10a Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 11 Feb 2022 06:40:40 +0100 Subject: extra/libcuckoo: proper patching of the unit tests and -latomic for i486 --- extra/libcuckoo/PKGBUILD | 25 +++++++++++++++++++-- .../libcuckoo/libcuckoo-0.3-resize-unit-test.patch | Bin 0 -> 2383 bytes 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 extra/libcuckoo/libcuckoo-0.3-resize-unit-test.patch diff --git a/extra/libcuckoo/PKGBUILD b/extra/libcuckoo/PKGBUILD index 86f9cd90..ffda60f6 100644 --- a/extra/libcuckoo/PKGBUILD +++ b/extra/libcuckoo/PKGBUILD @@ -1,2 +1,23 @@ -# ignoring tests for now, see https://github.com/efficient/libcuckoo/issues/143 -unset check +# fix tests with https://github.com/efficient/libcuckoo/commit/c749c88864d286c3d875b1de2a082355b7838af7, +# see https://github.com/efficient/libcuckoo/issues/137 +source+=('libcuckoo-0.3-resize-unit-test.patch') +md5sums+=('653038be4849c29e459e946ce0cbdac6') +eval "$( + { + declare -f prepare || \ + printf 'prepare() { cd "${pkgname}-${pkgver}"\n}\n' + } \ + | sed ' + $ i patch -Np1 -i "$srcdir/libcuckoo-0.3-resize-unit-test.patch" + ' +)" + +# i486 needs -latomic +if [ "$CARCH" = 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + s/cmake /cmake -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic / + ' + )" +fi diff --git a/extra/libcuckoo/libcuckoo-0.3-resize-unit-test.patch b/extra/libcuckoo/libcuckoo-0.3-resize-unit-test.patch new file mode 100644 index 00000000..839f4873 Binary files /dev/null and b/extra/libcuckoo/libcuckoo-0.3-resize-unit-test.patch differ -- cgit v1.2.3-54-g00ecf