aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Mynott <steve.mynott@gmail.com>2018-08-06 16:04:02 +0100
committerSteve Mynott <steve.mynott@gmail.com>2018-08-06 16:04:02 +0100
commit09f91944ef1bc8f7b4235c538630b58a4a347d0e (patch)
tree8473dcc26b1abbb8d7b2e6db61286df7261cd4f5
parent4cb2360c16a283b88439e4b43abb3edbb71d4a39 (diff)
apply MoarVM patch abf7d0c2 to fix compile on OpenBSD2018.06
-rw-r--r--patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch19
-rw-r--r--tools/star/Makefile2
2 files changed, 21 insertions, 0 deletions
diff --git a/patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch b/patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch
new file mode 100644
index 0000000..52d9346
--- /dev/null
+++ b/patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch
@@ -0,0 +1,19 @@
+# From abf7d0c282eae412159fef36ef85f08d333dff6b Mon Sep 17 00:00:00 2001
+# From: Steve Mynott <steve.mynott@gmail.com>
+# Date: Fri, 22 Jun 2018 16:07:08 +0100
+# Subject: [PATCH] Use clang with OpenBSD since their ancient gcc creates a moar
+# which can't generate NQP anymore.
+#
+#See #878
+
+--- ../MoarVM/build/setup.pm
++++ ../MoarVM/build/setup.pm
+@@ -583,7 +583,7 @@ our %SYSTEMS = (
+ linux => [ qw( posix gnu gcc ), { %OS_LINUX } ],
+ aix => [ qw( posix gnu gcc ), { %OS_AIX } ],
+ darwin => [ qw( posix gnu clang ), { %OS_DARWIN } ],
+- openbsd => [ qw( posix bsd gcc ), { %OS_OPENBSD} ],
++ openbsd => [ qw( posix bsd clang ), { %OS_OPENBSD} ],
+ netbsd => [ qw( posix bsd gcc ), { %OS_NETBSD } ],
+ dragonfly => [ qw( posix bsd gcc ), { %OS_DRAGONFLY } ],
+ freebsd => [ qw( posix bsd), $OS_FREEBSD{cc} , { %OS_FREEBSD } ],
diff --git a/tools/star/Makefile b/tools/star/Makefile
index 96daf01..f300a57 100644
--- a/tools/star/Makefile
+++ b/tools/star/Makefile
@@ -69,6 +69,8 @@ manifest: modules/DBIish/lib
patch:
patch -p1 < patches/star-ver.patch
+ patch -p1 < patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch
+
tarball: manifest patch
[ -n "$(VERSION)" ] || ( echo "\nTry '$(MAKE) release VERSION=yyyy.mm'\n\n"; exit 1 )