From 4719c39616cc7f5a9b7ae7753cc210db325fc518 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Tue, 4 May 2021 20:01:45 +0200 Subject: extra/openvdb: patch numpy problems and -latomic on i486 --- extra/openvdb/PKGBUILD | 25 +++++++++++++++++++++++++ extra/openvdb/openvdb-8.0.1-i486-atomic.patch | 12 ++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 extra/openvdb/PKGBUILD create mode 100644 extra/openvdb/openvdb-8.0.1-i486-atomic.patch diff --git a/extra/openvdb/PKGBUILD b/extra/openvdb/PKGBUILD new file mode 100644 index 00000000..4f9dfd9c --- /dev/null +++ b/extra/openvdb/PKGBUILD @@ -0,0 +1,25 @@ +# problems with python numpy on i486 +if [ "$CARCH" = 'i486' ]; then + eval "$( + declare -f build | \ + sed ' + s/-DUSE_NUMPY=ON/-DUSE_NUMPY=OFF/ + ' + )" +fi + +# -latomic on i486 +if [ "$CARCH" = 'i486' ]; then + source+=('openvdb-8.0.1-i486-atomic.patch') + sha512sums+=('e539db12513dbc62f7421504ef3751ca8f0b27c33250e80b47b979ba11e949060ebc96667a938d6baad47d0079c95a1714bee970e6627f99aa0790b5dfcfcc9f') +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "$srcdir/$pkgname-$pkgver" \ + patch -Np1 -i "$srcdir/openvdb-8.0.1-i486-atomic.patch" + ' +)" +fi diff --git a/extra/openvdb/openvdb-8.0.1-i486-atomic.patch b/extra/openvdb/openvdb-8.0.1-i486-atomic.patch new file mode 100644 index 00000000..767111df --- /dev/null +++ b/extra/openvdb/openvdb-8.0.1-i486-atomic.patch @@ -0,0 +1,12 @@ +diff -rauN openvdb-8.0.1/openvdb/openvdb/CMakeLists.txt openvdb-8.0.1-i486-atomic-patch/openvdb/openvdb/CMakeLists.txt +--- openvdb-8.0.1/openvdb/openvdb/CMakeLists.txt 2021-02-05 20:21:38.000000000 +0100 ++++ openvdb-8.0.1-i486-atomic-patch/openvdb/openvdb/CMakeLists.txt 2021-05-04 19:51:06.381394733 +0200 +@@ -166,7 +166,7 @@ + endif() + + if(USE_BLOSC OR USE_ZLIB) +- list(APPEND OPENVDB_CORE_DEPENDENT_LIBS ZLIB::ZLIB) ++ list(APPEND OPENVDB_CORE_DEPENDENT_LIBS ZLIB::ZLIB atomic) + endif() + + list(APPEND OPENVDB_CORE_DEPENDENT_LIBS -- cgit v1.2.3-70-g09d2