Update to 2016.07; similar diff from Caspar Schutijser on ports@.

This commit is contained in:
pascal 2016-08-06 16:30:07 +00:00
parent 6b15cf5086
commit c5a9393496
6 changed files with 13 additions and 53 deletions

View File

@ -1,17 +1,16 @@
# $OpenBSD: Makefile,v 1.12 2016/05/07 12:40:57 pascal Exp $
# $OpenBSD: Makefile,v 1.13 2016/08/06 16:30:07 pascal Exp $
ONLY_FOR_ARCHS = amd64 arm i386 mips64 mips64el powerpc sparc sparc64
BROKEN-arm = missing atomic ops (both AO_* and gcc builtin)
BROKEN-sparc64 = undefined reference to `AO_fetch_compare_and_swap_full'
BROKEN-hppa = dyncall_callvm.c:68:4: error: \#error unsupported platform
COMMENT = virtual machine for nqp/rakudo
V = 2015.12
V = 2016.07
DISTNAME = MoarVM-$V
PKGNAME = moarvm-$V
REVISION = 0
SHARED_LIBS = moar 5.0
SHARED_LIBS = moar 6.0
CATEGORIES = lang

View File

@ -1,2 +1,2 @@
SHA256 (MoarVM-2015.12.tar.gz) = Tk8QbsCALf2lIG/qgR0mDMERH+TPoTsDivkHfYrVaCY=
SIZE (MoarVM-2015.12.tar.gz) = 3273408
SHA256 (MoarVM-2016.07.tar.gz) = a3jiWlOZdE0+bcmOiWhJI02rF2DNYYwHz5SlDKrAam8=
SIZE (MoarVM-2016.07.tar.gz) = 3349812

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Configure_pl,v 1.5 2015/12/27 20:35:41 pascal Exp $
--- Configure.pl.orig Fri Dec 25 13:37:31 2015
+++ Configure.pl Sat Dec 26 10:34:05 2015
@@ -314,6 +314,10 @@ $config{ldflags} = join ' ', @ldflags;
$OpenBSD: patch-Configure_pl,v 1.6 2016/08/06 16:30:07 pascal Exp $
--- Configure.pl.orig Wed May 18 14:46:59 2016
+++ Configure.pl Fri Jun 17 20:36:20 2016
@@ -352,6 +352,10 @@ $config{ldflags} = join ' ', @ldflags;
$config{moarlib} = sprintf $config{lib}, $NAME;
$config{moardll} = sprintf $config{dll}, $NAME;

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-src_6model_reprs_P6bigint_c,v 1.1 2016/03/05 18:23:17 pascal Exp $
https://github.com/MoarVM/MoarVM/commit/24b386728c1ec71f56dd0eaf11303559528e3b37
--- src/6model/reprs/P6bigint.c.orig Sat Mar 5 19:20:52 2016
+++ src/6model/reprs/P6bigint.c Sat Mar 5 19:21:27 2016
@@ -1,5 +1,9 @@
#include "moar.h"
+#ifndef MIN
+ #define MIN(x,y) ((x)<(y)?(x):(y))
+#endif
+
/* A forced 64-bit version of mp_get_long, since on some platforms long is
* not all that long. */
static MVMuint64 mp_get_int64(MVMThreadContext *tc, mp_int * a) {

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_math_bigintops_c,v 1.1 2016/03/05 18:23:17 pascal Exp $
https://github.com/MoarVM/MoarVM/commit/24b386728c1ec71f56dd0eaf11303559528e3b37
--- src/math/bigintops.c.orig Sat Mar 5 19:16:48 2016
+++ src/math/bigintops.c Sat Mar 5 19:18:37 2016
@@ -1,6 +1,10 @@
#include "moar.h"
#include <math.h>
+#ifndef MAX
+ #define MAX(x,y) ((x)>(y)?(x):(y))
+#endif
+
/* Taken from mp_set_long, but portably accepts a 64-bit number. */
int MVM_bigint_mp_set_uint64(mp_int * a, MVMuint64 b) {
int x, res;

View File

@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2015/12/27 20:35:41 pascal Exp $
@comment $OpenBSD: PLIST,v 1.7 2016/08/06 16:30:07 pascal Exp $
@bin bin/moar
include/libtommath/
include/libuv/
include/libuv/android-ifaddrs.h
include/libuv/pthread-fixes.h
@ -79,6 +78,7 @@ include/moar/core/args.h
include/moar/core/bytecode.h
include/moar/core/bytecodedump.h
include/moar/core/callsite.h
include/moar/core/callstack.h
include/moar/core/coerce.h
include/moar/core/compunit.h
include/moar/core/continuation.h
@ -154,6 +154,7 @@ include/moar/platform/sys.h
include/moar/platform/threads.h
include/moar/platform/time.h
include/moar/profiler/
include/moar/profiler/heapsnapshot.h
include/moar/profiler/instrument.h
include/moar/profiler/log.h
include/moar/profiler/profile.h
@ -187,13 +188,6 @@ include/moar/strings/utf8_c8.h
include/moar/strings/windows1252.h
include/moar/types.h
include/moar/uthash.h
include/msinttypes/
include/msinttypes/inttypes.h
include/msinttypes/stdint.h
include/sha1/
include/sha1/sha1.h
include/tinymt/
include/tinymt/tinymt64.h
@lib lib/libmoar.so.${LIBmoar_VERSION}
share/nqp/
share/nqp/lib/