summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
author Andrew Clemons2022-03-21 07:23:34 +0100
committer Willy Sudiarto Raharjo2022-03-25 19:20:15 +0100
commitfc79a7780951ecfd13b410ccd1dc99b16b631fbe (patch)
tree6a5482f028190390fcbc7aad9e90c53e9732b08d /graphics
parentbc4830823f034074075456fa952a908ae8df8b3f (diff)
downloadslackbuilds-fc79a7780951ecfd13b410ccd1dc99b16b631fbe.tar.gz
graphics/brlcad: Fix 32bit build.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'graphics')
-rw-r--r--graphics/brlcad/brlcad-7.32.4-skip-gstep.patch12
-rw-r--r--graphics/brlcad/brlcad.SlackBuild8
2 files changed, 19 insertions, 1 deletions
diff --git a/graphics/brlcad/brlcad-7.32.4-skip-gstep.patch b/graphics/brlcad/brlcad-7.32.4-skip-gstep.patch
new file mode 100644
index 0000000000..5768ad63a2
--- /dev/null
+++ b/graphics/brlcad/brlcad-7.32.4-skip-gstep.patch
@@ -0,0 +1,12 @@
+--- a/db/nist/CMakeLists.txt
++++ b/db/nist/CMakeLists.txt
+@@ -10,7 +10,8 @@ set(NIST_SAMPLE_MODELS
+ )
+
+ foreach(im ${NIST_SAMPLE_MODELS})
+- ADD_G_TARGET(${im} "BRL-CAD Geometry Models/Sample")
++# disabled because this often segfaults
++# ADD_G_TARGET(${im} "BRL-CAD Geometry Models/Sample")
+ endforeach(im ${NIST_SAMPLE_MODELS})
+
+ CMAKEFILES(
diff --git a/graphics/brlcad/brlcad.SlackBuild b/graphics/brlcad/brlcad.SlackBuild
index 63c694ee67..d9c63891a1 100644
--- a/graphics/brlcad/brlcad.SlackBuild
+++ b/graphics/brlcad/brlcad.SlackBuild
@@ -19,11 +19,13 @@
# Previous version wouldn't build, updated for v7.32.4, and still
# had to patch that.
+# 20220321 acl: Modified by SlackBuilds.org: fix build on 15.0 32bit.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=brlcad
VERSION=${VERSION:-7.32.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -79,6 +81,10 @@ find -L . \
# https://github.com/BRL-CAD/brlcad/commit/b0dd45620f1ffdd8814069df091b20e8780e1b3e
patch -p1 < $CWD/fix-step-g-segfault.diff
+# thanks arch maintainers.
+# fixes build on i586.
+patch -p1 < $CWD/brlcad-7.32.4-skip-gstep.patch
+
mkdir -p build
cd build
# There is a "known issue" according to the guys on #brlcad and we need