Hello community, here is the log from the commit of package nqp for openSUSE:Factory checked in at 2014-03-11 06:46:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nqp (Old) and /work/SRC/openSUSE:Factory/.nqp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nqp" Changes: -------- --- /work/SRC/openSUSE:Factory/nqp/nqp.changes 2013-07-17 09:26:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nqp.new/nqp.changes 2014-03-11 06:46:38.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Mar 3 17:47:07 CET 2014 - mls@suse.de + +- update to version 2014.02 +- switch to moarvm as backend +- fix libdir calculation + new patch: usenqplibdir.diff + +------------------------------------------------------------------- Old: ---- nqp-2013.06.tar.gz New: ---- nqp-2014.02.tar.gz usenqplibdir.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nqp.spec ++++++ --- /var/tmp/diff_new_pack.xiITuQ/_old 2014-03-11 06:46:39.000000000 +0100 +++ /var/tmp/diff_new_pack.xiITuQ/_new 2014-03-11 06:46:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package nqp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: nqp -Version: 2013.06 +Version: 2014.02 Release: 0 Summary: Not Quite Perl License: Artistic-2.0 @@ -25,29 +25,23 @@ Url: http://rakudo.org/ Source: nqp-%{version}.tar.gz Patch1: arm-use-fpic.diff -BuildRequires: parrot-devel +Patch2: usenqplibdir.diff +BuildRequires: moarvm-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -%package devel -Summary: Not Quite Perl development headers and libraries -Group: Development/Languages/Other - %description This is "Not Quite Perl" -- a compiler for quickly generating PIR routines from Perl6-like code. -%description devel -This is "Not Quite Perl" -- a compiler for quickly generating PIR -routines from Perl6-like code. - -This package contains development files for nqp. - %prep %setup -q %patch1 +%patch2 +sed -i -e 's!@prefix@/lib/MAST!%{_libdir}/moar/MAST!g' tools/build/Makefile-Moar.in +sed -i -e 's!^NQP_LANG_DIR *=.*!NQP_LANG_DIR = %{_libdir}/moar/languages/nqp!' tools/build/Makefile-common.in %build -perl Configure.pl +perl Configure.pl --backends=moar --prefix=%{_usr} make %check @@ -60,13 +54,6 @@ %defattr(-,root,root) %doc CREDITS LICENSE %{_bindir}/* -%{_libdir}/parrot/*/languages/nqp -%{_libdir}/parrot/*/library/* -%{_libdir}/parrot/*/dynext/* -%{_libdir}/parrot/*/include/* - -%files devel -%defattr(-,root,root) -%{_includedir}/parrot/*/dynpmc/* +%{_libdir}/moar/languages/nqp %changelog ++++++ nqp-2013.06.tar.gz -> nqp-2014.02.tar.gz ++++++ ++++ 301974 lines of diff (skipped) ++++++ usenqplibdir.diff ++++++ --- ./tools/build/Makefile-Moar.in.orig 2014-03-03 17:33:25.805102951 +0000 +++ ./tools/build/Makefile-Moar.in 2014-03-03 17:34:27.323102842 +0000 @@ -69,7 +69,7 @@ m-install: m-all $(CP) $(P6QREGEX_MOAR) $(DESTDIR)$(NQP_LIB_DIR) $(CP) $(NQP_MOAR) $(DESTDIR)$(NQP_LIB_DIR) $(CP) $(P5QREGEX_MOAR) $(DESTDIR)$(NQP_LIB_DIR) - $(PERL) tools/build/install-moar-runner.pl "$(DESTDIR)" $(PREFIX) + $(PERL) tools/build/install-moar-runner.pl "$(DESTDIR)" $(PREFIX) $(NQP_LIB_DIR) # FIXME: M_CLEANUPS = *.moarvm gen/moar/* $(M_RUNNER) --- ./tools/build/install-moar-runner.pl.orig 2014-03-03 17:29:15.805103394 +0000 +++ ./tools/build/install-moar-runner.pl 2014-03-03 17:33:13.787102972 +0000 @@ -6,15 +6,14 @@ use warnings; use 5.008; use File::Spec; -my ($destdir, $prefix) = @ARGV; +my ($destdir, $prefix, $lib_dir) = @ARGV; my $realpath = $destdir.$prefix; unless (File::Spec->file_name_is_absolute($prefix)) { $prefix = File::Spec->rel2abs($prefix); } -my $lib_dir = File::Spec->catfile($prefix, 'languages', 'nqp', 'lib'); -my $nqp_mvm = File::Spec->catfile($prefix, 'languages', 'nqp', 'lib', 'nqp.moarvm'); +my $nqp_mvm = File::Spec->catfile($lib_dir, 'nqp.moarvm'); if ($^O eq 'MSWin32') { my $install_to = File::Spec->catfile($realpath, 'bin', 'nqp-m.bat'); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org