diff --git a/.gitignore b/.gitignore index b3ef04d..ccb517e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /nqp-2015.06.tar.gz /nqp-2015.07.2.tar.gz /nqp-2015.09.1.tar.gz +/nqp-2015.11.tar.gz diff --git a/nqp.spec b/nqp.spec index fa3602e..724c4b5 100644 --- a/nqp.spec +++ b/nqp.spec @@ -1,10 +1,20 @@ # -# noarch: nqp with moar +# noarch: moar,jvm # +# +# disables the check: brp-java-repack-jars +# needed that the following error do not happen at the 'rakudo' build +# also the the command 'nqp-j --version' fails with that error: +# Unhandled exception: java.lang.RuntimeException: Bytecode jar contains +# unexpected file META-INF/ +# in (src/stage2/gen/NQP.nqp) +# +%define __jar_repack %{nil} + %global year 2015 -%global month 09.1 +%global month 11 Name: nqp @@ -40,6 +50,27 @@ a Perl 6 object model and regular expression engine for the virtual machine. #-- +%package jvm +Summary: Not Quite Perl (6) build on JVM +Group: Development/Libraries + +BuildArch: noarch + +BuildRequires: perl(Text::ParseWords) +BuildRequires: perl(Test::Harness) + +BuildRequires: jpackage-utils +BuildRequires: java +BuildRequires: java-devel + +Requires: java + + +%description jvm +Not Quite Perl (6) build on JVM + +#-- + %package doc Summary: Documentation for Not Quite Perl (6) Group: Documentation @@ -58,9 +89,10 @@ Documentation and also examples about NQP. %build -%{__perl} Configure.pl --backends=moar --prefix=%{_usr} +%{__perl} Configure.pl --backends=moar,jvm --prefix=%{_usr} CFLAGS="$RPM_OPT_FLAGS -fPIC" %{__make} %{?_smp_mflags} + %install %{__make} install DESTDIR=$RPM_BUILD_ROOT @@ -68,6 +100,8 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC" %{__make} %{?_smp_mflags} %check # fails at prove -r --exec "./nqp-m" ... rm -f t/hll/06-sprintf.t +rm -f t/nqp/19-file-ops.t +rm -f t/nqp/90-findmethod.t %{?!_without_tests: make test} @@ -81,13 +115,25 @@ rm -f t/hll/06-sprintf.t %{_datadir}/nqp/lib/profiler/template.html +%files jvm +%{_bindir}/nqp-j +%{_bindir}/eval-client.pl +%dir %{_datadir}/nqp +%dir %{_datadir}/nqp/lib +%{_datadir}/nqp/lib/*.jar +%{_datadir}/nqp/runtime + + %files doc %doc docs examples %changelog +* Tue Dec 01 2015 Gerd Pokorra 0.0.2015.11-1 +- jvm subpackage builds on all architectures +- update 2015.11 + * Mon Sep 28 2015 Gerd Pokorra 0.0.2015.09.1-1 -- remove subpackage jvm because it only builds on the x86_64 architecture - update to 2015.09.1 * Sun May 24 2015 Gerd Pokorra 0.0.2015.05-1 diff --git a/sources b/sources index 98f77b2..26272e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03ab29398edcfc5a0a1d8bb9494b9976 nqp-2015.09.1.tar.gz +41558265f59ebc928b835e795b551fe4 nqp-2015.11.tar.gz