diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest index 748cc98..8841bc0 100644 --- a/dev-lang/moarvm/Manifest +++ b/dev-lang/moarvm/Manifest @@ -1,3 +1,4 @@ DIST MoarVM-2016.01.tar.gz 3314742 SHA256 d409b684c7c92b144b31cf7f0408f30ccbb033ce646f57d7fbaeb9683773e37b SHA512 019433a985c8245c231d533b8310fceda185a694681aaecb922602ad98897c636c40fbe1a36ba656af4c242b28315611f656454eb41f25e0f891b652210eb435 WHIRLPOOL f603e1f60667771e0200e731b37ff854346d00a0de484a9b3072f83e0ee624bc2b7d7e862c872d9062a4397adb5bfab31d835754966a7fe44490312c82a37e8e DIST MoarVM-2016.02.tar.gz 3313448 SHA256 3bdacebba98e6b2d3d10f12af0ab514dec27fb24b15ed00aef479b7d190ce40a SHA512 fdeb107e071bcd7a893f15f105e722543010a87710cbd2ac4ce322000c96c9dae5c5e661dd8d60e712c4fe22d860650a003485d75f95a5b19fcde266f8fe483d WHIRLPOOL 9ccb54d147d558b4fa52bfe9b098384b3d61dffba598db803828bb0cbbc8bae9fd6a527d093c07a421cd97a59952e11ffaf9c6cef93ce9b48778009558e96732 DIST MoarVM-2016.03.tar.gz 3318299 SHA256 dfc3914e609f30ff06f14267bcbb4fcc6da3d85782d35c1838701a5ea41d8f2f SHA512 358c48f6b1803e39841e9f287f2fe3cdde743962d9d9c34e629c18b1b7290fd8a713917f24233dd092ed68adf9a6d0aadb25bda22b3e353d40bd57ae58d70216 WHIRLPOOL e68dfbc40bda23a49c28089fe8396e5a182afc0ac2550f9ab5d9f1564943af163fcc68b466feaf0778a2df57cd472c87f0853d47882b9b625434c7740ec5aec4 +DIST MoarVM-2016.04.tar.gz 3332850 SHA256 6fe9000daada59535747f2557cc73573241ba8a6044271caf1647aa37be33c6d SHA512 ef22145c9f7c32d7d12192cee63f286544500adff40fc2dbaad677d57108bc6efedc348fe8ddf460fe12d2c6b282e885bcb74fb3bcaa1e06b7719754175afe7d WHIRLPOOL e314f80cd785d31768630798647d7f445831bb29aaded88ef32326df3f4705a5d3fba2da00fce6888a2256b57aeb838922e94c3096250d30112f2be2bfacbb92 diff --git a/dev-lang/moarvm/files/Configure-2016.03.patch b/dev-lang/moarvm/files/Configure-2016.03.patch new file mode 100644 index 0000000..1c74cab --- /dev/null +++ b/dev-lang/moarvm/files/Configure-2016.03.patch @@ -0,0 +1,129 @@ +diff -Naur a/build/Makefile.in b/build/Makefile.in +--- a/build/Makefile.in 2016-04-01 18:11:09.000000000 +0200 ++++ b/build/Makefile.in 2016-04-27 01:07:14.633545568 +0200 +@@ -454,9 +454,6 @@ + $(CP) src/strings/*.h $(DESTDIR)$(PREFIX)/include/moar/strings + $(CP) src/jit/*.h $(DESTDIR)$(PREFIX)/include/moar/jit + $(CP) src/instrument/*.h $(DESTDIR)$(PREFIX)/include/moar/instrument +- $(MKPATH) $(DESTDIR)$(PREFIX)/include/libuv +- $(MKPATH) $(DESTDIR)$(PREFIX)/include/libtommath +- $(CP) 3rdparty/libuv/include/*.h $(DESTDIR)$(PREFIX)/include/libuv + @install@ + + lib: @moar@ +diff -Naur a/build/setup.pm b/build/setup.pm +--- a/build/setup.pm 2016-04-01 18:11:09.000000000 +0200 ++++ b/build/setup.pm 2016-04-27 01:07:30.326630039 +0200 +@@ -125,7 +125,7 @@ + ccshared => '-fPIC', + ldshared => '-shared @ccshared@', + moarshared => '', +- ldrpath => '-Wl,-rpath,@libdir@ -Wl,-rpath,@prefix@/share/perl6/site/lib', ++ ldrpath => '-Wl,-rpath,/@libdir@ -Wl,-rpath,@prefix@/share/perl6/site/lib', + + arflags => 'rcs', + arout => '', +diff -Naur a/Configure.pl b/Configure.pl +--- a/Configure.pl 2016-04-01 18:11:09.000000000 +0200 ++++ b/Configure.pl 2016-04-27 01:07:14.634545574 +0200 +@@ -32,7 +32,7 @@ + os=s shell=s toolchain=s compiler=s + ar=s cc=s ld=s make=s has-sha has-libuv + static has-libtommath has-libatomic_ops +- has-dyncall has-libffi ++ has-dyncall has-libffi pkgconfig=s + build=s host=s big-endian jit! enable-jit lua=s has-dynasm + prefix=s bindir=s libdir=s mastdir=s make-install asan ubsan), + 'no-optimize|nooptimize' => sub { $args{optimize} = 0 }, +@@ -99,6 +99,7 @@ + $config{osname} = $^O; + $config{osvers} = $Config{osvers}; + $config{lua} = $args{lua} // './3rdparty/dynasm/minilua@exe@'; ++$config{pkgconfig} = $args{pkgconfig} // '/usr/bin/pkg-config'; + + # set options that take priority over all others + my @keys = qw( ar cc ld make ); +@@ -164,12 +165,30 @@ + system($defaults{make}, 'realclean') + } + ++# test whether pkg-config works ++system("$config{pkgconfig}", "--version"); ++if ( $? == 0 ) { ++ $config{pkgconfig_works} = 1; ++} else { ++ $config{pkgconfig_works} = 0; ++} ++ + # conditionally set include dirs and install rules + $config{cincludes} //= ''; + $config{install} //= ''; + if ($args{'has-libuv'}) { + $defaults{-thirdparty}->{uv} = undef; + unshift @{$config{usrlibs}}, 'uv'; ++ if ($config{pkgconfig_works}) { ++ my $result = `$config{pkgconfig} --cflags libuv`; ++ if ( $? == 0 ) { ++ $result =~ s/\n/ /g; ++ $config{cincludes} .= ' ' . "$result"; ++ print("Adding extra include for libuv: $result\n"); ++ } else { ++ print("Error occured when running $config{pkgconfig} --cflags libuv."); ++ } ++ } + } + else { + $config{cincludes} .= ' ' . $defaults{ccinc} . '3rdparty/libuv/include' +@@ -181,6 +200,16 @@ + if ($args{'has-libatomic_ops'}) { + $defaults{-thirdparty}->{lao} = undef; + unshift @{$config{usrlibs}}, 'atomic_ops'; ++ if ($config{pkgconfig_works}) { ++ my $result = `$config{pkgconfig} --cflags atomic_ops`; ++ if ( $? == 0 ) { ++ $result =~ s/\n/ /g; ++ $config{cincludes} .= ' ' . "$result"; ++ print("Adding extra include for atomic_ops: $result\n"); ++ } else { ++ print("Error occured when running $config{pkgconfig} --cflags atomic_ops."); ++ } ++ } + } + else { + $config{cincludes} .= ' ' . $defaults{ccinc} . '3rdparty/libatomic_ops/src'; +@@ -232,6 +261,16 @@ + $config{nativecall_backend} = 'libffi'; + unshift @{$config{usrlibs}}, 'ffi'; + push @{$config{defs}}, 'HAVE_LIBFFI'; ++ if ($config{pkgconfig_works}) { ++ my $result = `$config{pkgconfig} --cflags libffi`; ++ if ( $? == 0 ) { ++ $result =~ s/\n/ /g; ++ $config{cincludes} .= ' ' . "$result"; ++ print("Adding extra include for libffi: $result\n"); ++ } else { ++ print("Error occured when running $config{pkgconfig} --cflags libffi."); ++ } ++ } + } + elsif ($args{'has-dyncall'}) { + unshift @{$config{usrlibs}}, 'dyncall_s', 'dyncallback_s', 'dynload_s'; +@@ -364,6 +403,7 @@ + print "\n", <perl@gentoo.org Gentoo Perl Project + + Enable clang's Address Sanitizer functionality. Expect longer compile time. + Use clang compiler instead of GCC + Enable Just-In-Time-Compiler. Has no effect except on AMD64 and Darwin. + Enable optimization via CFLAGS + Link against the system's shared libraries + Enable clang's Undefined Behavior Sanitizer functionality. Expect longer compile time. + MoarVM/MoarVM diff --git a/dev-lang/moarvm/moarvm-2016.04.ebuild b/dev-lang/moarvm/moarvm-2016.04.ebuild new file mode 100644 index 0000000..988b5fa --- /dev/null +++ b/dev-lang/moarvm/moarvm-2016.04.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit flag-o-matic + +MY_PN="MoarVM" + +DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" +HOMEPAGE="http://moarvm.org" +SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz" +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="asan clang debug doc +jit static-libs +system-libs optimize ubsan" + +RDEPEND="dev-libs/libatomic_ops + dev-libs/libtommath + dev-libs/libuv + jit? ( dev-lang/lua:0[deprecated] + dev-lua/LuaBitOp ) + virtual/libffi" +DEPEND="${RDEPEND} + clang? ( >=sys-devel/clang-3.1 ) + dev-lang/perl" + +S="${WORKDIR}/MoarVM-${PV}" +PATCHES=( "${FILESDIR}/Configure-2016.03.patch" ) +DOCS=( CREDITS README.markdown ) + +src_prepare() { + eapply "${PATCHES[@]}" + eapply_user + use doc && DOCS+=( docs/* ) +} + +src_configure() { + local myconfigargs=( + "--prefix=/usr" + "--libdir=$(get_libdir)" + "--compiler=$(usex clang clang gcc)" + "$(usex asan --asan)" + "$(usex debug --debug --no-debug)" + "$(usex jit --lua=/usr/bin/lua --no-jit)" + "$(usex optimize --optimize= --no-optimize)" + "$(usex static-libs --static)" + "$(usex system-libs --has-libtommath)" + "$(usex system-libs --has-libuv)" + "$(usex system-libs --has-libatomic_ops)" + "$(usex system-libs --has-libffi)" + "$(usex ubsan --ubsan)" + ) + use optimize && filter-flags '-O*' + + perl Configure.pl "${myconfigargs[@]}" || die +} diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild deleted file mode 100644 index 0b704eb..0000000 --- a/dev-lang/moarvm/moarvm-9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils git-r3 - -MY_PN="MoarVM" - -DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6" -HOMEPAGE="https://github.com/MoarVM/MoarVM" -EGIT_REPO_URI="https://github.com/MoarVM/MoarVM.git" - -LICENSE="Artistic-2" -SLOT="0" -KEYWORDS="" -IUSE="doc" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-lang/perl" - -src_prepare() { - epatch "${FILESDIR}/Configure-9999.patch" || die -} - -src_configure() { - # this is quite badong, but wtf build system - echo "2013.10-145-gec52026" >> VERSION - perl Configure.pl --prefix="${D}/usr"|| die -} - -src_install() { - make install -} diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest index fe18590..31cdb1c 100644 --- a/dev-lang/nqp/Manifest +++ b/dev-lang/nqp/Manifest @@ -1,3 +1,4 @@ DIST nqp-2016.01.tar.gz 5117110 SHA256 87875120af7167093643f2a35869d66a61f735220a9348627ba89cf294387c8b SHA512 e79668f7f5f3679fe3b93f63e1151da1eab109ef4acc6f8ae3da3d9e5c3da814440dd43279978b1a13f30647d7c52bda5575b02f366bd928965b06b47c6d6d91 WHIRLPOOL d2369417707332d8bc045f6f93da81e1301ec2599f197664d80e6edeefc1bc7a2147ad3b7e893eef0fb6b96adf2f68f5ab44b948801e266e68d99552253abeda DIST nqp-2016.02.tar.gz 5121833 SHA256 051ddd4bab8f73a688836d896340320ff7043a6ecbd5c53be099249e75e33b8d SHA512 9a3233e351ebdf73ed27d3eade2052936d1a49ea95d32a8176e426e7126c720e4a3f69dedc4067925272293329b08ab397f6a7523b9e4129952847fbd86fcf0d WHIRLPOOL 1bad2dc420d59f07c3d9b8d9dcc78d51a772ed2672419fc53e427c68e24fce5645a0dcfd4a4e138e6333f9e909297b49fafe190e6dc763cca8e52dce20309ec5 DIST nqp-2016.03.tar.gz 5126687 SHA256 50731983cfc0800015bf73a2174000f5631ad09b551ff190153fba00a448067f SHA512 707701e22752cb43b0694c8c57ec834cfee3d2a50c2b6ae3ee36af5881728c94ae1d03d07c624367edb6cf58bba18abd26dcc18656b0483f4f979db5dd26a07e WHIRLPOOL 364abefc3d7b005b89fd3a3180e66971dbc56851377b93e38d2a8b2ed546121ec730628e0f93947f77e8f12346d64e60b4af8ffa720dc0a05810fae846b262a4 +DIST nqp-2016.04.tar.gz 5156494 SHA256 9176422eb2a99db24ab520bc78686f3a2c008ba73bf8c7091a790985f5061019 SHA512 5dcb685a90b26fee3e8dac3ca24da11bd967d034b5328232d18d9db37e27645b57259cabf54ef8e10b3ac508b1aa784072f0a9542d30168d3017f86e610c3cee WHIRLPOOL 0711e1471740b0ed181f9e4504f810a084056e74650c0ffb1c6c17e2976b2c1facb6a7e73df5d991d9ffe43f055fe844f0756dbd816375708b4d499a0f7a9162 diff --git a/dev-lang/nqp/files/enable-external-jars.patch b/dev-lang/nqp/files/enable-external-jars.patch new file mode 100644 index 0000000..cf5d4bd --- /dev/null +++ b/dev-lang/nqp/files/enable-external-jars.patch @@ -0,0 +1,214 @@ +diff --git a/Configure.pl b/Configure.pl +index 2064ac8..73e2d27 100755 +--- a/Configure.pl ++++ b/Configure.pl +@@ -34,6 +34,7 @@ MAIN: { + 'no-clean', + 'with-parrot=s', 'gen-parrot:s', 'parrot-config=s', 'parrot-option=s@', + 'with-moar=s', 'gen-moar:s', 'moar-option=s@', ++ 'with-asm=s', 'with-asm-tree=s', 'with-jline=s', 'with-jna=s', + 'make-install!', 'makefile-timing!', + 'git-protocol=s', + 'git-depth=s', 'git-reference=s',); +@@ -50,6 +51,53 @@ MAIN: { + "Use --prefix to specify a directory in which parrot is installed."; + } + ++ if ($options{'with-asm'}) { ++ if ($options{'with-asm'} ne '-') { ++ $config{'asm'} = $options{'with-asm'}; ++ } ++ } else { ++ $config{'asm'} = "3rdparty/asm/asm-4.1.jar"; ++ } ++ if ($options{'with-asm-tree'}) { ++ if ($options{'with-asm-tree'} ne '-') { ++ $config{'asmtree'} = $options{'with-asm-tree'}; ++ } ++ } else { ++ $config{'asmtree'} = "3rdparty/asm/asm-tree-4.1.jar"; ++ } ++ if ($options{'with-jline'}) { ++ if ($options{'with-jline'} ne '-') { ++ $config{'jline'} = $options{'with-jline'}; ++ } ++ } else { ++ $config{'jline'} = "3rdparty/jline/jline-1.0.jar"; ++ } ++ if ($options{'with-jna'}) { ++ if ($options{'with-jna'} ne '-') { ++ $config{'jna'} = $options{'with-jna'}; ++ } ++ } else { ++ $config{'jna'} = "3rdparty/jna/jna.jar"; ++ } ++ ++ if ($^O eq 'MSWin32') { ++ $config{'asmfile'} = $config{'asm'}; ++ $config{'asmfile'} =~ s/.*\\//; ++ $config{'jlinefile'} = $config{'jline'}; ++ $config{'jlinefile'} =~ s/.*\\//; ++ } else { ++ $config{'asmfile'} = $config{'asm'}; ++ $config{'asmfile'} =~ s/.*\///; ++ $config{'jlinefile'} = $config{'jline'}; ++ $config{'jlinefile'} =~ s/.*\///; ++ } ++ ++ fill_template_file( ++ 'tools/build/install-jvm-runner.pl.in', ++ 'tools/build/install-jvm-runner.pl', ++ %config, ++ ); ++ + my $default_backend; + my @backends; + my %backends; +@@ -357,6 +405,11 @@ General Options: + --gen-moar Download and build a copy of MoarVM to use + --moar-option='--option=value' + Options to pass to MoarVM configuration for --gen-moar ++ --with-asm='/path/to/jar' ++ --with-asm-tree='/path/to/jar' ++ --with-jline='/path/to/jar' ++ --with-jna='/path/to/jar' ++ Provide paths to already installed jars + --git-protocol={ssh,https,git} + Protocol to use for git clone. Default: https + --make-install Immediately run `MAKE install` after configuring +diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in +index 27959ad..c19965a 100644 +--- a/tools/build/Makefile-JVM.in ++++ b/tools/build/Makefile-JVM.in +@@ -2,7 +2,6 @@ BAT = @bat@ + JAVA = java + JAVAC = javac + JAR = jar +-ASM = 3rdparty/asm/ + J_RUNNER = nqp-j$(BAT) + + NQP_JAR_DIR = $(NQP_LANG_DIR)/runtime +@@ -18,7 +17,11 @@ RUNTIME_JAVAS = \ + + RUNTIME_JAR = nqp-runtime.jar + +-THIRDPARTY_JARS = $(ASM)asm-4.1.jar@cpsep@$(ASM)asm-tree-4.1.jar@cpsep@3rdparty/jline/jline-1.0.jar@cpsep@3rdparty/jna/jna.jar ++ASM = @asm@ ++ASMTREE = @asmtree@ ++JLINE = @jline@ ++JNA = @jna@ ++THIRDPARTY_JARS = $(ASM)@cpsep@$(ASMTREE)@cpsep@$(JLINE)@cpsep@$(JNA) + J_STAGE0 = src/vm/jvm/stage0 + J_STAGE1 = $(JVM_BUILD_DIR)/stage1 + J_STAGE2 = $(JVM_BUILD_DIR)/stage2 +@@ -80,8 +83,8 @@ j-install: j-all + $(MKPATH) $(DESTDIR)$(BIN_DIR) + $(MKPATH) $(DESTDIR)$(NQP_JAR_DIR) + $(MKPATH) $(DESTDIR)$(NQP_LIB_DIR) +- $(CP) 3rdparty/asm/asm-4.1.jar 3rdparty/asm/asm-tree-4.1.jar $(DESTDIR)$(NQP_JAR_DIR) +- $(CP) 3rdparty/jline/jline-1.0.jar 3rdparty/jna/jna.jar $(DESTDIR)$(NQP_JAR_DIR) ++ $(CP) $(ASM) $(ASMTREE) $(DESTDIR)$(NQP_JAR_DIR) ++ $(CP) $(JLINE) $(JNA) $(DESTDIR)$(NQP_JAR_DIR) + $(CP) $(RUNTIME_JAR) $(DESTDIR)$(NQP_JAR_DIR) + $(CP) $(NQP_MO_JAR) $(MODULE_LOADER_JAR) $(DESTDIR)$(NQP_LIB_DIR) + $(CP) $(CORE_SETTING_JAR) $(QASTNODE_JAR) $(QREGEX_JAR) $(DESTDIR)$(NQP_LIB_DIR) +diff --git a/tools/build/install-jvm-runner.pl b/tools/build/install-jvm-runner.pl +deleted file mode 100644 +index 14541d6..0000000 +--- a/tools/build/install-jvm-runner.pl ++++ /dev/null +@@ -1,44 +0,0 @@ +-#!/usr/bin/perl +-# Copyright (C) 2013, The Perl Foundation. +- +-use strict; +-use warnings; +-use 5.008; +-use File::Spec; +- +-my ($destdir, $prefix) = @ARGV; +-my $realpath = $destdir.$prefix; +- +-unless (File::Spec->file_name_is_absolute($prefix)) { +- $prefix = File::Spec->rel2abs($prefix); +-} +- +-if ($^O eq 'MSWin32') { +- my $jar_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'runtime'); +- my $lib_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'lib'); +- my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j.bat'); +- +- open my $fh, ">", $install_to +- or die "Could not open $install_to: $!"; +- print $fh '@java -Xss1m -Xmx512m -Xbootclasspath/a:' . $jar_dir . '\\nqp-runtime.jar;' . +- "$jar_dir\\asm-4.1.jar;$jar_dir\\jline-1.0.jar;$lib_dir\\nqp.jar -cp $lib_dir nqp %*\n"; +- close $fh +- or die "Could not close $install_to: $!"; +-} +-else { +- my $nqp_dir = File::Spec->catfile($prefix, qw/share nqp/); +- my $jar_dir = File::Spec->catfile('${NQP_DIR}', 'runtime'); +- my $lib_dir = File::Spec->catfile('${NQP_DIR}', 'lib'); +- my $jars = "$jar_dir/nqp-runtime.jar:$jar_dir/asm-4.1.jar:$jar_dir/jline-1.0.jar:$lib_dir/nqp.jar"; +- my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j'); +- +- open my $fh, ">", $install_to +- or die "Could not open $install_to: $!"; +- print $fh "#!/bin/sh\n"; +- print $fh ": \${NQP_DIR:=\"$nqp_dir\"}\n"; +- print $fh ": \${NQP_JARS:=\"$jars\"}\n"; +- print $fh "exec java -Xss1m -Xmx512m -Xbootclasspath/a:\${NQP_JARS} -cp $lib_dir nqp \"\$\@\"\n"; +- close $fh +- or die "Could not close $install_to: $!"; +- chmod 0755, $install_to; +-} +diff --git a/tools/build/install-jvm-runner.pl.in b/tools/build/install-jvm-runner.pl.in +new file mode 100644 +index 0000000..92a1109 +--- /dev/null ++++ b/tools/build/install-jvm-runner.pl.in +@@ -0,0 +1,44 @@ ++#!/usr/bin/perl ++# Copyright (C) 2013, The Perl Foundation. ++ ++use strict; ++use warnings; ++use 5.008; ++use File::Spec; ++ ++my ($destdir, $prefix) = @ARGV; ++my $realpath = $destdir.$prefix; ++ ++unless (File::Spec->file_name_is_absolute($prefix)) { ++ $prefix = File::Spec->rel2abs($prefix); ++} ++ ++if ($^O eq 'MSWin32') { ++ my $jar_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'runtime'); ++ my $lib_dir = File::Spec->catfile($prefix, 'share', 'nqp', 'lib'); ++ my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j.bat'); ++ ++ open my $fh, ">", $install_to ++ or die "Could not open $install_to: $!"; ++ print $fh '@java -Xss1m -Xmx512m -Xbootclasspath/a:' . $jar_dir . '\\nqp-runtime.jar;' . ++ "$jar_dir\\@asmfile@;$jar_dir\\@jlinefile@;$lib_dir\\nqp.jar -cp $lib_dir nqp %*\n"; ++ close $fh ++ or die "Could not close $install_to: $!"; ++} ++else { ++ my $nqp_dir = File::Spec->catfile($prefix, qw/share nqp/); ++ my $jar_dir = File::Spec->catfile('${NQP_DIR}', 'runtime'); ++ my $lib_dir = File::Spec->catfile('${NQP_DIR}', 'lib'); ++ my $jars = "$jar_dir/nqp-runtime.jar:$jar_dir/@asmfile@:$jar_dir/@jlinefile@:$lib_dir/nqp.jar"; ++ my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-j'); ++ ++ open my $fh, ">", $install_to ++ or die "Could not open $install_to: $!"; ++ print $fh "#!/bin/sh\n"; ++ print $fh ": \${NQP_DIR:=\"$nqp_dir\"}\n"; ++ print $fh ": \${NQP_JARS:=\"$jars\"}\n"; ++ print $fh "exec java -Xss1m -Xmx512m -Xbootclasspath/a:\${NQP_JARS} -cp $lib_dir nqp \"\$\@\"\n"; ++ close $fh ++ or die "Could not close $install_to: $!"; ++ chmod 0755, $install_to; ++} diff --git a/dev-lang/nqp/metadata.xml b/dev-lang/nqp/metadata.xml index a710c2f..620f2ca 100644 --- a/dev-lang/nqp/metadata.xml +++ b/dev-lang/nqp/metadata.xml @@ -10,6 +10,7 @@ Gentoo Perl Project + Toggle usage of the clang compiler in conjunction with MoarVM Build the MoarVM backend (experimental/broken) diff --git a/dev-lang/nqp/nqp-2016.04.ebuild b/dev-lang/nqp/nqp-2016.04.ebuild new file mode 100644 index 0000000..249dd66 --- /dev/null +++ b/dev-lang/nqp/nqp-2016.04.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit java-pkg-2 + +DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler" +HOMEPAGE="http://rakudo.org/" +SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz" + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="doc clang java +moar" +REQUIRED_USE="|| ( java moar )" + +RDEPEND="java? ( >=virtual/jre-1.7:* + dev-java/asm:4 + dev-java/jline:0 ) + moar? ( ~dev-lang/moarvm-${PV}[clang=] ) + dev-libs/libffi" +DEPEND="${RDEPEND} + clang? ( sys-devel/clang ) + java? ( >=virtual/jdk-1.7:* ) + dev-lang/perl" +S="${WORKDIR}/perl6-nqp" +PATCHES=( "${FILESDIR}/enable-external-jars.patch" ) + +pkg_setup() { + use java && java-pkg-2_pkg_setup +} + +src_prepare() { + eapply "${PATCHES[@]}" + eapply_user + use java && java-pkg-2_src_prepare +} + +src_unpack() { + unpack ${A} + mv "${WORKDIR}/perl6-nqp-"* "${WORKDIR}/perl6-nqp" || die +} + +src_configure() { + # 2016.04 doesn't like our jna-3.4.1 + # keep testing against it + local backends + use java && backends+="jvm," + use moar && backends+="moar" + local myconfargs=( + "--backend=${backends}" + "--with-asm=$(echo $(java-pkg_getjars asm-4) | tr : '\n' | grep '/asm\.jar$')" + "--with-asm-tree=$(echo $(java-pkg_getjars asm-4) | tr : '\n' | grep '/asm-tree\.jar$')" + "--with-jline=$(echo $(java-pkg_getjars jline) | tr : '\n' | grep '/jline\.jar$')" + "--prefix=/usr" ) + perl Configure.pl "${myconfargs[@]}" || die +} + +src_compile() { + MAKEOPTS=-j1 emake +} + +src_test() { + MAKEOPTS=-j1 emake test +} + +src_install() { + emake DESTDIR="${ED}" install || die + + dodoc CREDITS README.pod || die + + if use doc; then + dodoc -r docs/* || die + fi +} diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest index b19f9e9..0738835 100644 --- a/dev-lang/rakudo/Manifest +++ b/dev-lang/rakudo/Manifest @@ -1,3 +1,4 @@ DIST rakudo-2016.01.1.tar.gz 2687265 SHA256 897d01bcb27c209bd51918bb5be6adc6e6ea9dbc2c6b65414f9ac081aa8c5d7b SHA512 31228d49577f5d25b306a987650af0ae11bb2fa80fcaeee421dbe88dc9812edd5a399999f8727dee11d74177b7b9bca0290e26c4240c7baed35fabb4c912f85f WHIRLPOOL 52b2d7d1a0461883b1d07bbb492994f7eb8930a8726565d9a4788883e16510fc052dc066bf8443e09042548d76a3f3ca1cb17be8baa23b16f5742eb52f33c39b DIST rakudo-2016.02.tar.gz 2691766 SHA256 8ccfbf24f49bf4f5aa0304ffa69abbd90b97dc59f2c65e2384c6b609e3d3f00a SHA512 9fa891a84e882626050772231dee15ad20f1c2d84b5b9ff985964efbff45f18e0a1940dad2cc1fbb8b91f69d9f7f2a3034998819e8ddbf0c380684b326d299ca WHIRLPOOL 2a55ec29df905ec79fee842f84394ac8733d1b116fc90c29a06e8953a77b15bfc193d974a804f99d41ee0b9fce87d4b07ff6e367f03243d08d03f20340fe766e DIST rakudo-2016.03.tar.gz 2702229 SHA256 d77b58acb09f34c99af94f32db92698df88cda7015c7630ddb1392adbf703471 SHA512 53619288655edf72f986cb5fe7b72cd70ed88a6b18421d46d5d70a8932ca22eb1067be5ddf98264e576f7d81a84d9bbaca2ac5ac3241e582d2f4672589ba7ab1 WHIRLPOOL 43696dda25214aa9e30be7c1c3323dee8ea0f1c50a5754ca2a08d421b4c59cac5001fa4a63d8086ce0cb97801eb098d4e854ca4b801eaf7d277099bf6d86b655 +DIST rakudo-2016.04.tar.gz 2706659 SHA256 207d723c9b2d524daf6008a3ed026ea06773d937e76e0fe79b89bfb7dcd0d92b SHA512 08e718643cfa89edbb8995ab9f350f69053e41cff97b33530dd2eb202d2ab2116d219ef1385717b48f5883665c73a181b1b054c1300db302fba31c6081e97532 WHIRLPOOL d49791b696114f57b685221be5cfe1873a88507810819b2a9aace07da2c2d7535eeaecc6c830df3265ecd1ff352effa509cbb3f24cba7e8afc0dc1468553cce6 diff --git a/dev-lang/rakudo/files/rakudo-2016.03-Makefile.in.patch b/dev-lang/rakudo/files/rakudo-2016.03-Makefile.in.patch new file mode 100644 index 0000000..adafa0d --- /dev/null +++ b/dev-lang/rakudo/files/rakudo-2016.03-Makefile.in.patch @@ -0,0 +1,17 @@ +diff -Naur a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in +--- a/tools/build/Makefile-Moar.in 2016-02-02 14:27:13.000000000 +0100 ++++ b/tools/build/Makefile-Moar.in 2016-04-22 15:01:35.338534944 +0200 +@@ -87,11 +87,11 @@ + $(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \ + -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \ + -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt -I$(PREFIX)/include/libtommath \ +- -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC) ++ -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_OPS_OBJ) $(M_PERL6_OPS_SRC) + $(M_CC) @moar::ccswitch@ @moar::ccshared@ $(M_CFLAGS) -I$(PREFIX)/include/libatomic_ops \ + -I$(PREFIX)/include/dyncall -I$(PREFIX)/include/moar \ + -I$(PREFIX)/include/sha1 -I$(PREFIX)/include/tinymt -I$(PREFIX)/include/libtommath \ +- -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC) ++ -I$(PREFIX)/include/libuv -I$(PREFIX)/include @moar::cincludes@ @moar::ccout@$(M_PERL6_CONT_OBJ) $(M_PERL6_CONT_SRC) + $(M_LD) @moar::ldswitch@ -L@moar::libdir@ @moar::ldshared@ $(M_LDFLAGS) @moar::ldout@$(M_PERL6_OPS_DLL) $(M_PERL6_OPS_OBJ) $(M_PERL6_CONT_OBJ) -lmoar @moarimplib@ + + $(PERL6_ML_MOAR): src/Perl6/ModuleLoader.nqp src/vm/moar/ModuleLoaderVMConfig.nqp diff --git a/dev-lang/rakudo/metadata.xml b/dev-lang/rakudo/metadata.xml index 5a5e997..eb9eaa1 100644 --- a/dev-lang/rakudo/metadata.xml +++ b/dev-lang/rakudo/metadata.xml @@ -5,8 +5,12 @@ patrick@gentoo.org Patrick Lauer - + perl@gentoo.org Gentoo Perl Project - + + + Use Clang to compile the MoarVM backend + Use the MoarVM as backend + diff --git a/dev-lang/rakudo/rakudo-2016.04.ebuild b/dev-lang/rakudo/rakudo-2016.04.ebuild new file mode 100644 index 0000000..bf5232d --- /dev/null +++ b/dev-lang/rakudo/rakudo-2016.04.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit java-pkg-2 + +DESCRIPTION="A compiler for the Perl 6 programming language" +HOMEPAGE="http://rakudo.org" + +if [[ ${PV} == "9999" ]]; then + EGIT_REPO_URI="https://github.com/rakudo/${PN}.git" + inherit git-r3 +else + SRC_URI="${HOMEPAGE}/downloads/${PN}/${P}.tar.gz" +fi + +LICENSE="Artistic-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +# TODO: add USE="javascript" once that's usable in nqp +IUSE="clang java moar test" + +RDEPEND="=dev-lang/nqp-${PV}:=[java=,moar=,clang=]" +DEPEND="${RDEPEND} + clang? ( sys-devel/clang ) + >=dev-lang/perl-5.10" + +REQUIRED_USE="|| ( java moar )" +PATCHES=( "${FILESDIR}/${PN}-2016.03-Makefile.in.patch" ) + +pkg_setup() { + use java && java-pkg-2_pkg_setup +} + +src_prepare() { + eapply "${PATCHES[@]}" + + # yup, this is ugly. but emake doesn't respect DESTDIR. + for i in Moar JVM; do + echo "DESTDIR = ${D}" > "${T}/Makefile-${i}.in" || die + cat "${S}/tools/build/Makefile-${i}.in" >> "${T}/Makefile-${i}.in" || die + mv "${T}/Makefile-${i}.in" "${S}/tools/build/Makefile-${i}.in" || die + done + + eapply_user + use java && java-pkg-2_src_prepare +} + +src_configure() { + local backends + use java && backends+="jvm," + use moar && backends+="moar," + local myargs=( "--prefix=/usr" + "--sysroot=/" + "--sdkroot=/" + "--make-install" + "--sdkroot=/" + "--backends=${backends}" + ) + perl Configure.pl "${myargs[@]}" +} + +src_compile() { + emake DESTDIR="${D}" +} + +src_test() { + export RAKUDO_PRECOMP_PREFIX=$(mktemp -d) + default +} + +src_install() { + emake DESTDIR="${D}" install +} diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index be11969..5ab7ece 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -5,6 +5,11 @@ # This file requires >=portage-2.1.1 # New entries go on top. +# Matthew Brewer (21 Apr 2016) +# Upstream supports using Clang's address sanitizer, but apparently +# invokes it wrong. +dev-lang/moarvm asan + # Johannes Huber (21 Apr 2016) # Unreleased dependency. kde-apps/ktp-text-ui speech