Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2021-05-04 20:01:45 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2021-05-04 20:01:45 +0200
commit4719c39616cc7f5a9b7ae7753cc210db325fc518 (patch)
treea587682171ac3db1a1773a067cd166e520889521
parent778065db298f5cde4f025d1c720326400bd69d55 (diff)
extra/openvdb: patch numpy problems and -latomic on i486
-rw-r--r--extra/openvdb/PKGBUILD25
-rw-r--r--extra/openvdb/openvdb-8.0.1-i486-atomic.patch12
2 files changed, 37 insertions, 0 deletions
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