Update to 2015.10; similar diff from Carlin Bingham.

This commit is contained in:
pascal 2015-11-05 11:52:32 +00:00
parent 79e02ae2ae
commit d12d746f91
8 changed files with 20 additions and 89 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.22 2015/08/25 14:21:25 sthen Exp $
# $OpenBSD: Makefile,v 1.23 2015/11/05 11:52:32 pascal Exp $
SHARED_ONLY = Yes
COMMENT = Rakudo Perl 6 compiler
V = 2015.03
REVISION = 0
V = 2015.10
DISTNAME = rakudo-$V
NQP_VERSION = 2015.03
NQP_VERSION = 2015.10
CATEGORIES = lang perl6
@ -19,14 +18,16 @@ MAINTAINER = Pascal Stumpf <Pascal.Stumpf@cubes.de>
# Artistic 2
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += atomic_ops kvm m moar pthread
WANTLIB += atomic_ops ffi kvm m moar pthread
GH_ACCOUNT = rakudo
GH_PROJECT = rakudo
GH_TAGNAME = $V
MASTER_SITES = ${MASTER_SITES_GITHUB}
BUILD_DEPENDS = lang/nqp>=${NQP_VERSION}
BUILD_DEPENDS = lang/nqp>=${NQP_VERSION} \
math/libtommath
LIB_DEPENDS = lang/moarvm
RUN_DEPENDS = lang/nqp>=${NQP_VERSION}
LIB_DEPENDS = lang/moarvm

View File

@ -1,2 +1,2 @@
SHA256 (rakudo-2015.03.tar.gz) = K051m5fAjz1V/K2kOBxOUBlkNdH2A0b5fvh01j/fLKQ=
SIZE (rakudo-2015.03.tar.gz) = 633727
SHA256 (rakudo-2015.10.tar.gz) = ES+cP5fjK5ydKxylAFc5VSUxNzUX2/eTlV2Rs78gh60=
SIZE (rakudo-2015.10.tar.gz) = 726353

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-docs_S11-Modules-proposal_pod,v 1.1 2015/04/09 17:35:55 pascal Exp $
https://github.com/rakudo/rakudo/commit/7920c16b8d81f0feaf16ed5ce9620c26ca67e63e
--- docs/S11-Modules-proposal.pod.orig Fri Mar 20 01:19:53 2015
+++ docs/S11-Modules-proposal.pod Thu Mar 26 11:04:30 2015
@@ -63,7 +63,7 @@ to use your modules, don't use Unicode in your module
Rakudo effectively gives the following output to -e'.say for @*INC'
~/.perl6/lib
- parrot_install/lib/2.1.0-devel/languages/perl6/lib
+ parrot_install/lib/2.1.0-devel/share/perl6/lib
.
The . entry may be removed from the default @*INC because it creates a

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-src_core_Inc_pm,v 1.1 2015/04/09 17:35:55 pascal Exp $
https://github.com/rakudo/rakudo/commit/7920c16b8d81f0feaf16ed5ce9620c26ca67e63e
--- src/core/Inc.pm.orig Fri Mar 20 01:19:53 2015
+++ src/core/Inc.pm Thu Mar 26 11:04:30 2015
@@ -94,7 +94,7 @@
}
#?endif
- my $prefix := $*VM.prefix ~ '/languages/perl6';
+ my $prefix := $*VM.prefix ~ '/share/perl6';
my $abspath := "$prefix/share/libraries.json";
if IO::Path.new-from-absolute-path($abspath).e {
my $config = from-json( slurp $abspath );

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-src_vm_moar_ModuleLoaderVMConfig_nqp,v 1.1 2015/04/09 17:35:55 pascal Exp $
https://github.com/rakudo/rakudo/commit/7920c16b8d81f0feaf16ed5ce9620c26ca67e63e
--- src/vm/moar/ModuleLoaderVMConfig.nqp.orig Fri Mar 20 01:19:53 2015
+++ src/vm/moar/ModuleLoaderVMConfig.nqp Thu Mar 26 11:04:30 2015
@@ -1,9 +1,9 @@
role Perl6::ModuleLoaderVMConfig {
method vm_search_paths() {
my @search_paths;
- @search_paths.push(nqp::backendconfig<prefix> ~ '/languages/perl6/lib');
+ @search_paths.push(nqp::backendconfig<prefix> ~ '/share/perl6/lib');
# XXX CHEAT: Goes away when we implement :from<nqp>.
- @search_paths.push(nqp::backendconfig<prefix> ~ '/languages/nqp/lib');
+ @search_paths.push(nqp::backendconfig<prefix> ~ '/share/nqp/lib');
@search_paths
}

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-tools_build_Makefile-Moar_in,v 1.1 2015/04/09 17:35:55 pascal Exp $
https://github.com/rakudo/rakudo/commit/7920c16b8d81f0feaf16ed5ce9620c26ca67e63e
--- tools/build/Makefile-Moar.in.orig Fri Mar 20 01:19:53 2015
+++ tools/build/Makefile-Moar.in Thu Mar 26 11:04:30 2015
@@ -7,7 +7,7 @@ M_GEN_CAT = tools/build/gen-cat.nqp moar
MOAR = $(PREFIX)@slash@bin@slash@moar@exe@
M_NQP = $(PREFIX)@slash@bin@slash@nqp-m@runner_suffix@
-M_LIBPATH = $(PREFIX)@slash@languages@slash@nqp@slash@lib
+M_LIBPATH = $(PREFIX)@slash@share@slash@nqp@slash@lib
M_RUN_PERL6 = $(MOAR) --libpath="$(M_LIBPATH)" perl6.moarvm

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-tools_build_Makefile-common_in,v 1.1 2015/04/09 17:35:55 pascal Exp $
https://github.com/rakudo/rakudo/commit/7920c16b8d81f0feaf16ed5ce9620c26ca67e63e
--- tools/build/Makefile-common.in.orig Fri Mar 20 01:19:53 2015
+++ tools/build/Makefile-common.in Thu Mar 26 11:04:30 2015
@@ -9,7 +9,7 @@ RM_F = $(PERL) -MExtUtils::Command -e rm_f
RM_RF = $(PERL) -MExtUtils::Command -e rm_rf
PREFIX = @prefix@
-PERL6_LANG_DIR = $(PREFIX)/languages/perl6
+PERL6_LANG_DIR = $(PREFIX)/share/perl6
BOOTSTRAP_SOURCES = \
src/Perl6/Metamodel/BOOTSTRAP.nqp \

View File

@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST,v 1.9 2015/04/09 17:35:55 pascal Exp $
@comment $OpenBSD: PLIST,v 1.10 2015/11/05 11:52:32 pascal Exp $
bin/perl6
bin/perl6-debug-m
bin/perl6-gdb-m
bin/perl6-m
bin/perl6-valgrind-m
share/nqp/lib/Perl6/
share/nqp/lib/Perl6/Actions.moarvm
share/nqp/lib/Perl6/BOOTSTRAP.moarvm
@ -15,8 +17,16 @@ share/nqp/lib/Perl6/Pod.moarvm
share/nqp/lib/Perl6/World.moarvm
share/perl6/
share/perl6/lib/
share/perl6/lib/NativeCall/
share/perl6/lib/NativeCall.pm
share/perl6/lib/NativeCall.pm.moarvm
share/perl6/lib/NativeCall/Compiler/
share/perl6/lib/NativeCall/Compiler/GNU.pm
share/perl6/lib/NativeCall/Compiler/GNU.pm.moarvm
share/perl6/lib/NativeCall/Compiler/MSVC.pm
share/perl6/lib/NativeCall/Compiler/MSVC.pm.moarvm
share/perl6/lib/NativeCall/Types.pm
share/perl6/lib/NativeCall/Types.pm.moarvm
share/perl6/lib/Pod/
share/perl6/lib/Pod/To/
share/perl6/lib/Pod/To/Text.pm
@ -25,8 +35,6 @@ share/perl6/lib/Test.pm
share/perl6/lib/Test.pm.moarvm
share/perl6/lib/lib.pm6
share/perl6/lib/lib.pm6.moarvm
share/perl6/lib/nqp.pm6
share/perl6/lib/nqp.pm6.moarvm
share/perl6/runtime/
share/perl6/runtime/CORE.setting.moarvm
share/perl6/runtime/RESTRICTED.setting.moarvm