You'll need to bump for amd64, the final plist changes slightly (extra
@comment line), otherwise ok.
--
Sent from a phone, apologies for poor formatting.
On 29 November 2017 20:18:02 Andrew Hewus Fresh <[email protected]> wrote:
On Mon, Nov 27, 2017 at 05:06:18PM +0000, Stuart Henderson wrote:
On 2017/11/25 14:50, Andrew Fresh wrote:
> Log message:
> Update perl6 (lang/moarvm lang/nqp lang/rakudo) to 2017.10
This one fails packaging on i386:
Error:
/usr/obj/ports/moarvm-2017.10/fake-i386/usr/local/include/moar/jit/core_templates.h
does not exist
I was attempting to test this on my macppc, but ran into this issue:
https://github.com/rakudo/rakudo/issues/1257
But, that said, this diff seems to work on both my i386 and amd64
machines, many thanks to sthen@ for the pointers on how what to do.
My octeon has been sitting at this building nqp for days now, but it did
successfully build moarvm with the patch:
Creating tools/build/install-jvm-runner.pl ...
(also no idea why just that one file is special)
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/moarvm/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 25 Nov 2017 21:50:50 -0000 1.16
+++ Makefile 29 Nov 2017 20:10:20 -0000
@@ -31,6 +31,12 @@ LIB_DEPENDS = devel/libffi \
MAKE_FLAGS = NOISY=1
+.if ${MACHINE_ARCH} == "amd64"
+PKG_ARGS+=-Djit=1
+.else
+PKG_ARGS+=-Djit=0
+.endif
+
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = /usr/bin/perl Configure.pl
CONFIGURE_ARGS += --cc="${CC}" --ld="${CC}" \
Index: pkg/PFRAG.jit
===================================================================
RCS file: pkg/PFRAG.jit
diff -N pkg/PFRAG.jit
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.jit 29 Nov 2017 20:10:20 -0000
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+include/moar/jit/core_templates.h
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/moarvm/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 25 Nov 2017 21:50:50 -0000 1.9
+++ pkg/PLIST 29 Nov 2017 20:10:20 -0000
@@ -139,7 +139,7 @@ include/moar/io/syncsocket.h
include/moar/io/timers.h
include/moar/jit/
include/moar/jit/compile.h
-include/moar/jit/core_templates.h
+%%jit%%
include/moar/jit/expr.h
include/moar/jit/expr_ops.h
include/moar/jit/graph.h
