summaryrefslogtreecommitdiffstats
path: root/science
diff options
context:
space:
mode:
authorFlorian Franzmann2020-01-19 00:48:08 +0100
committerFlorian Franzmann2020-01-19 00:48:08 +0100
commit0943471ab1471861bf9ce8f005f8194e56cec82a (patch)
treee58881dfabce325e6eb15cb7531b9e325022d9f9 /science
parentc7cbd894ea55f34272b11f16d0137a2d46f7fb00 (diff)
science/openscad: fix build with boost 1.72.0
Diffstat (limited to 'science')
-rw-r--r--science/openscad/HISTORY4
-rwxr-xr-xscience/openscad/PRE_BUILD5
-rw-r--r--science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch27
3 files changed, 36 insertions, 0 deletions
diff --git a/science/openscad/HISTORY b/science/openscad/HISTORY
index 4618823d5c..fac7bbfd67 100644
--- a/science/openscad/HISTORY
+++ b/science/openscad/HISTORY
@@ -1,3 +1,7 @@
+2020-01-19 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, openscad-2019.05_fix-boost-1.72.0-build.patch: add patch
+ from gentoo to fix build with boost 1.72.0
+
2019-10-05 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
* DEPENDS: remove bogus dependency on cmake
diff --git a/science/openscad/PRE_BUILD b/science/openscad/PRE_BUILD
new file mode 100755
index 0000000000..cdec0b7e69
--- /dev/null
+++ b/science/openscad/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/openscad-2019.05_fix-boost-1.72.0-build.patch"
+
diff --git a/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch b/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch
new file mode 100644
index 0000000000..28d3285a73
--- /dev/null
+++ b/science/openscad/openscad-2019.05_fix-boost-1.72.0-build.patch
@@ -0,0 +1,27 @@
+From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Fri, 25 Oct 2019 15:10:26 +0000
+Subject: [PATCH] Add missing header bootlegged by Boost < 1.72
+
+src/parser.y:76:6: error: no template named 'stack' in namespace 'std'
+std::stack<LocalScope *> scope_stack;
+~~~~~^
+---
+ src/parser.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parser.y b/src/parser.y
+index 7f4fd56c..4c77c989 100644
+--- a/src/parser.y
++++ b/src/parser.y
+@@ -46,6 +46,7 @@
+ #include "printutils.h"
+ #include "memory.h"
+ #include <sstream>
++#include <stack>
+ #include <boost/filesystem.hpp>
+ #include "boost-utils.h"
+ #include "feature.h"
+--
+2.24.1
+