Update to 2015.01. Use external libatomic_ops. Use positive ONLY_FOR_ARCHS

list derived from the archs dyncall runs on, minus those who are big endian. Upstream still does not support BE.
2015-02-03 13:24:19 +00:00 · 2015-02-03 13:24:19 +00:00 · b5125e0a90
commit b5125e0a90
parent 199625875a
6 changed files with 68 additions and 104 deletions
--- a/lang/moarvm/Makefile
+++ b/lang/moarvm/Makefile
@ -1,21 +1,17 @@
-# $OpenBSD: Makefile,v 1.4 2014/09/30 19:11:48 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2015/02/03 13:24:19 pascal Exp $

-# note about 3rdparty libs: there's another copy of libatomic_ops at
-# devel/boehm-gc which this port will be able to use if that is updated.
+ONLY_FOR_ARCHS =	amd64 arm i386 mips64el

 SHARED_ONLY =		Yes
 BROKEN-arm =		missing atomic ops
-BROKEN-mips64 =		missing atomic ops
-BROKEN-alpha =		dyncall_callvm.c:66:4: error: #error unsupported platform
-BROKEN-hppa =		dyncall_callvm.c:66:4: error: #error unsupported platform

 COMMENT =		virtual machine for nqp/rakudo

-V =			2014.05
+V =			2015.01
 DISTNAME =		MoarVM-$V
 PKGNAME =		moarvm-$V

-SHARED_LIBS =		moar	0.0
+SHARED_LIBS =		moar	1.0

 CATEGORIES =		lang

@ -26,15 +22,20 @@ MAINTAINER =		Pascal Stumpf <Pascal.Stumpf@cubes.de>
 # Artistic2
 PERMIT_PACKAGE_CDROM =	Yes

-WANTLIB =		c kvm m pthread
+WANTLIB =		atomic_ops c kvm m pthread

 MASTER_SITES =		http://moarvm.org/releases/

+LIB_DEPENDS =		devel/boehm-gc,-atomic
+
 MAKE_FLAGS =		NOISY=1

+CFLAGS +=		-I${LOCALBASE}/include
+
 CONFIGURE_STYLE =	simple
 CONFIGURE_SCRIPT =	/usr/bin/perl Configure.pl
-CONFIGURE_ARGS +=	--cc="${CC}" --optimize=0 --prefix="${PREFIX}"
+CONFIGURE_ARGS +=	--cc="${CC}" --optimize=0 --prefix="${PREFIX}" \
+			--has-libatomic_ops
 CONFIGURE_ENV =		SO_VERSION="${LIBmoar_VERSION}"

 NO_TEST =		Yes
--- a/lang/moarvm/distinfo
+++ b/lang/moarvm/distinfo
@ -1,2 +1,2 @@
-SHA256 (MoarVM-2014.05.tar.gz) = TeWrHGPDi0lF+oIeNlioYuKmPeZRwWw6sNLWawv4CFc=
-SIZE (MoarVM-2014.05.tar.gz) = 2183408
+SHA256 (MoarVM-2015.01.tar.gz) = 0C0Jchutc7jyqkYLtzG2xZ+3vZv2m+tbgHdKPZgGW5M=
+SIZE (MoarVM-2015.01.tar.gz) = 2519960
--- a/lang/moarvm/patches/patch-Configure_pl
+++ b/lang/moarvm/patches/patch-Configure_pl
@ -1,7 +1,7 @@
-$OpenBSD: patch-Configure_pl,v 1.1.1.1 2014/05/25 21:49:55 pascal Exp $
--- Configure.pl.orig	Thu May 22 20:46:53 2014
-+++ Configure.pl	Fri May 23 23:36:57 2014
-@@ -197,6 +197,10 @@ $config{ldflags} = join ' ', @ldflags;
+$OpenBSD: patch-Configure_pl,v 1.2 2015/02/03 13:24:19 pascal Exp $
+--- Configure.pl.orig	Wed Nov 19 17:19:32 2014
+++ Configure.pl	Fri Dec 12 17:40:47 2014
+@@ -320,6 +320,10 @@ $config{ldflags} = join ' ', @ldflags;
 $config{moarlib} = sprintf $config{lib}, $NAME;
 $config{moardll} = sprintf $config{dll}, $NAME;
 
--- a/lang/moarvm/patches/patch-build_Makefile_in
+++ b/lang/moarvm/patches/patch-build_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-build_Makefile_in,v 1.1.1.1 2014/05/25 21:49:55 pascal Exp $
--- build/Makefile.in.orig	Fri Jan 24 22:30:34 2014
-+++ build/Makefile.in	Fri Jan 24 22:30:46 2014
-@@ -25,7 +25,7 @@ NOERR =
- @mknoisy@
+$OpenBSD: patch-build_Makefile_in,v 1.2 2015/02/03 13:24:19 pascal Exp $
+--- build/Makefile.in.orig	Tue Nov 18 08:57:00 2014
+++ build/Makefile.in	Fri Dec 12 17:18:31 2014
+@@ -36,7 +36,7 @@ MASTDIR   = @mastdir@
+ 
+ PKGCONFIGDIR = @prefix@/share/pkgconfig
 
- PREFIX    = @prefix@
 -CFLAGS    = @cflags@ @ccdef@MVM_TRACING=$(TRACING) @ccdef@MVM_CGOTO=$(CGOTO)
 +CFLAGS    += @cflags@ @ccdef@MVM_TRACING=$(TRACING) @ccdef@MVM_CGOTO=$(CGOTO)
- CINCLUDES = @ccinc@3rdparty/libuv/include \
-             @ccinc@3rdparty/libuv/src \
-             @ccinc@3rdparty/libatomic_ops/src \
+ CINCLUDES = @cincludes@ \
+             @ccinc@@shaincludedir@ \
+             @ccinc@3rdparty/tinymt \
--- a/lang/moarvm/patches/patch-build_setup_pm
+++ b/lang/moarvm/patches/patch-build_setup_pm
@ -0,0 +1,12 @@
+$OpenBSD: patch-build_setup_pm,v 1.1 2015/02/03 13:24:19 pascal Exp $
+--- build/setup.pm.orig	Fri Dec 12 17:40:52 2014
+++ build/setup.pm	Fri Dec 12 17:41:14 2014
+@@ -129,7 +129,7 @@ our %TC_POSIX = (
+     ccshared   => '-fPIC',
+     ldshared   => '-shared @ccshared@',
+     moarshared => '',
+-    ldrpath    => '-Wl,-rpath,@libdir@',
+    ldrpath    => '-Wl,-rpath,@libdir@ @lddir@@libdir@',
+ 
+     arflags => 'rcs',
+     arout   => '',
--- a/lang/moarvm/pkg/PLIST
+++ b/lang/moarvm/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2014/05/25 21:49:55 pascal Exp $
+@comment $OpenBSD: PLIST,v 1.2 2015/02/03 13:24:19 pascal Exp $
@bin bin/moar
 include/dyncall/
 include/dyncall/dyncall.h
@ -69,94 +69,24 @@ include/dyncall/dyncall_value.h
 include/dyncall/dyncall_vector.h
 include/dyncall/dynload.h
 include/dyncall/dynload_alloc.h
-include/libatomic_ops/
-include/libatomic_ops/atomic_ops/
-include/libatomic_ops/atomic_ops.h
-include/libatomic_ops/atomic_ops/ao_version.h
-include/libatomic_ops/atomic_ops/generalize-arithm.h
-include/libatomic_ops/atomic_ops/generalize-small.h
-include/libatomic_ops/atomic_ops/generalize.h
-include/libatomic_ops/atomic_ops/sysdeps/
-include/libatomic_ops/atomic_ops/sysdeps/all_acquire_release_volatile.h
-include/libatomic_ops/atomic_ops/sysdeps/all_aligned_atomic_load_store.h
-include/libatomic_ops/atomic_ops/sysdeps/all_atomic_load_store.h
-include/libatomic_ops/atomic_ops/sysdeps/all_atomic_only_load.h
-include/libatomic_ops/atomic_ops/sysdeps/ao_t_is_int.h
-include/libatomic_ops/atomic_ops/sysdeps/armcc/
-include/libatomic_ops/atomic_ops/sysdeps/armcc/arm_v6.h
-include/libatomic_ops/atomic_ops/sysdeps/emul_cas.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/
-include/libatomic_ops/atomic_ops/sysdeps/gcc/aarch64.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/alpha.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/arm.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/avr32.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/cris.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/generic-arithm.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/generic-small.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/generic.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/hexagon.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/hppa.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/ia64.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/m68k.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/mips.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/powerpc.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/s390.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/sh.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/sparc.h
-include/libatomic_ops/atomic_ops/sysdeps/gcc/x86.h
-include/libatomic_ops/atomic_ops/sysdeps/generic_pthread.h
-include/libatomic_ops/atomic_ops/sysdeps/hpc/
-include/libatomic_ops/atomic_ops/sysdeps/hpc/hppa.h
-include/libatomic_ops/atomic_ops/sysdeps/hpc/ia64.h
-include/libatomic_ops/atomic_ops/sysdeps/ibmc/
-include/libatomic_ops/atomic_ops/sysdeps/ibmc/powerpc.h
-include/libatomic_ops/atomic_ops/sysdeps/icc/
-include/libatomic_ops/atomic_ops/sysdeps/icc/ia64.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/acquire_release_volatile.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/atomic_load.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/atomic_store.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/char_acquire_release_volatile.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/char_atomic_load.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/char_atomic_store.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/double_atomic_load_store.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/int_acquire_release_volatile.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/int_atomic_load.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/int_atomic_store.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/ordered_loads_only.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/ordered_stores_only.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/short_acquire_release_volatile.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/short_atomic_load.h
-include/libatomic_ops/atomic_ops/sysdeps/loadstore/short_atomic_store.h
-include/libatomic_ops/atomic_ops/sysdeps/msftc/
-include/libatomic_ops/atomic_ops/sysdeps/msftc/arm.h
-include/libatomic_ops/atomic_ops/sysdeps/msftc/common32_defs.h
-include/libatomic_ops/atomic_ops/sysdeps/msftc/x86.h
-include/libatomic_ops/atomic_ops/sysdeps/msftc/x86_64.h
-include/libatomic_ops/atomic_ops/sysdeps/ordered.h
-include/libatomic_ops/atomic_ops/sysdeps/ordered_except_wr.h
-include/libatomic_ops/atomic_ops/sysdeps/read_ordered.h
-include/libatomic_ops/atomic_ops/sysdeps/standard_ao_double_t.h
-include/libatomic_ops/atomic_ops/sysdeps/sunc/
-include/libatomic_ops/atomic_ops/sysdeps/sunc/sparc.h
-include/libatomic_ops/atomic_ops/sysdeps/sunc/x86.h
-include/libatomic_ops/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h
-include/libatomic_ops/atomic_ops/sysdeps/test_and_set_t_is_char.h
-include/libatomic_ops/config.h
 include/libtommath/
 include/libtommath/tommath.h
 include/libtommath/tommath_class.h
 include/libtommath/tommath_superclass.h
 include/libuv/
+include/libuv/android-ifaddrs.h
 include/libuv/pthread-fixes.h
 include/libuv/stdint-msvc2008.h
 include/libuv/tree.h
+include/libuv/uv-aix.h
 include/libuv/uv-bsd.h
 include/libuv/uv-darwin.h
 include/libuv/uv-errno.h
 include/libuv/uv-linux.h
 include/libuv/uv-sunos.h
+include/libuv/uv-threadpool.h
 include/libuv/uv-unix.h
+include/libuv/uv-version.h
 include/libuv/uv-win.h
 include/libuv/uv.h
 include/linenoise/
@ -166,6 +96,7 @@ include/moar/6model/
 include/moar/6model/6model.h
 include/moar/6model/bootstrap.h
 include/moar/6model/containers.h
+include/moar/6model/parametric.h
 include/moar/6model/reprconv.h
 include/moar/6model/reprs/
 include/moar/6model/reprs.h
@ -213,6 +144,7 @@ include/moar/6model/serialization.h
 include/moar/bithacks.h
 include/moar/config.h
 include/moar/core/
+include/moar/core/alloc.h
 include/moar/core/args.h
 include/moar/core/bytecode.h
 include/moar/core/bytecodedump.h
@ -223,6 +155,7 @@ include/moar/core/continuation.h
 include/moar/core/dll.h
 include/moar/core/exceptions.h
 include/moar/core/ext.h
+include/moar/core/fixedsizealloc.h
 include/moar/core/frame.h
 include/moar/core/hll.h
 include/moar/core/instance.h
@ -239,7 +172,9 @@ include/moar/gc/
 include/moar/gc/allocation.h
 include/moar/gc/collect.h
 include/moar/gc/debug.h
+include/moar/gc/finalize.h
 include/moar/gc/gen2.h
+include/moar/gc/objectid.h
 include/moar/gc/orchestrate.h
 include/moar/gc/roots.h
 include/moar/gc/wb.h
@ -261,10 +196,15 @@ include/moar/io/syncpipe.h
 include/moar/io/syncsocket.h
 include/moar/io/syncstream.h
 include/moar/io/timers.h
+include/moar/jit/
+include/moar/jit/compile.h
+include/moar/jit/emit.h
+include/moar/jit/graph.h
+include/moar/jit/log.h
 include/moar/mast/
 include/moar/mast/compiler.h
 include/moar/mast/driver.h
-include/moar/mast/nodes_moar.h
+include/moar/mast/nodes.h
 include/moar/math/
 include/moar/math/bigintops.h
 include/moar/math/num.h
@ -277,6 +217,10 @@ include/moar/platform/stdint.h
 include/moar/platform/sys.h
 include/moar/platform/threads.h
 include/moar/platform/time.h
+include/moar/profiler/
+include/moar/profiler/instrument.h
+include/moar/profiler/log.h
+include/moar/profiler/profile.h
 include/moar/spesh/
 include/moar/spesh/args.h
 include/moar/spesh/candidate.h
@ -285,12 +229,16 @@ include/moar/spesh/deopt.h
 include/moar/spesh/dump.h
 include/moar/spesh/facts.h
 include/moar/spesh/graph.h
+include/moar/spesh/inline.h
 include/moar/spesh/log.h
 include/moar/spesh/manipulate.h
 include/moar/spesh/optimize.h
+include/moar/spesh/osr.h
+include/moar/spesh/threshold.h
 include/moar/strings/
 include/moar/strings/ascii.h
 include/moar/strings/decode_stream.h
+include/moar/strings/iter.h
 include/moar/strings/latin1.h
 include/moar/strings/ops.h
 include/moar/strings/unicode.h
@ -307,7 +255,10 @@ include/sha1/
 include/sha1/sha1.h
 include/tinymt/
 include/tinymt/tinymt64.h
-lib/MAST/
-lib/MAST/Nodes.nqp
-lib/MAST/Ops.nqp
@lib lib/libmoar.so.${LIBmoar_VERSION}
+share/nqp/
+share/nqp/lib/
+share/nqp/lib/MAST/
+share/nqp/lib/MAST/Nodes.nqp
+share/nqp/lib/MAST/Ops.nqp
+share/pkgconfig/moar.pc