diff --git a/.gitignore b/.gitignore index f2d8e55..0a6b6e4 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ rakudo-2010.07.tar.gz /2019.03.tar.gz /rakudo-2019.11.tar.gz /rakudo-2020.01.tar.gz +/rakudo-2020.02.tar.gz diff --git a/M_LIBPATH_to_NQP_LIBPATH.patch b/M_LIBPATH_to_NQP_LIBPATH.patch deleted file mode 100644 index 5d8764b..0000000 --- a/M_LIBPATH_to_NQP_LIBPATH.patch +++ /dev/null @@ -1,128 +0,0 @@ -# -# eliminating 'M_LIBPATH' and substitute it with 'NQP_LIBPATH' -# Fix the bug: -# https://bugzilla.redhat.com/show_bug.cgi?id=1728608 -# -# Moarvm files goes to %{_libdir}/nqp/Perl6 in place -# of %{_libdir}/nqp/lib/Perl6 -# -# ---- tools/build/Makefile-Moar.in 2019-03-07 21:56:47.000000000 +0100 -+++ tools/build/Makefile-Moar.in 2019-07-12 16:19:15.718079665 +0200 -@@ -11,11 +11,10 @@ - MOAR = @moar::bindir@@slash@moar@exe@ - M_NQP = @m_nqp@ - M_LIBDEFPATH = $(PREFIX)@slash@share@slash@nqp@slash@lib --M_LIBPATH = $(LIBDIR)@slash@nqp@slash@lib - M_INCPATH = $(MOAR_PREFIX)@slash@include - NQP_LIBPATH = @nqp::libdir@ - --M_RUN_PERL6 = $(MOAR) --libpath="blib" --libpath="$(M_LIBPATH)" --libpath="$(NQP_LIBPATH)" perl6.moarvm --nqp-lib=blib -+M_RUN_PERL6 = $(MOAR) --libpath="blib" --libpath="$(NQP_LIBPATH)" perl6.moarvm --nqp-lib=blib - - M_BAT = @runner_suffix@ - M_RUNNER = perl6-m@runner_suffix@ -@@ -184,7 +183,7 @@ - - $(M_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_MOAR) $(SETTING_MOAR) - $(RM_F) $(M_RUNNER) -- $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-m . "" --nqp-lib=blib . blib "$(M_LIBPATH)" "$(NQP_LIBPATH)" -+ $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-m . "" --nqp-lib=blib . blib "$(NQP_LIBPATH)" - -$(CHMOD) 755 $(M_RUNNER) - - m-runner-default: $(M_RUNNER) -@@ -198,21 +197,21 @@ - --vmlibs=$(M_PERL6_OPS_DLL)=Rakudo_ops_init $(M_BUILD_DIR)/perl6-debug.nqp - - $(M_DEBUG_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_DEBUG_MOAR) $(SETTING_MOAR) -- $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm perl6-debug-m . "" --nqp-lib=blib . blib "$(M_LIBPATH)" "$(NQP_LIBPATH)" -+ $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm perl6-debug-m . "" --nqp-lib=blib . blib "$(NQP_LIBPATH)" - - $(M_GDB_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_MOAR) $(SETTING_MOAR) - $(RM_F) $(M_GDB_RUNNER) -- $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-gdb-m . "gdb" --nqp-lib=blib . blib "$(M_LIBDEFPATH)" "$(M_LIBPATH)" "$(NQP_LIBPATH)" -+ $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-gdb-m . "gdb" --nqp-lib=blib . blib "$(M_LIBDEFPATH)" "$(NQP_LIBPATH)" - -$(CHMOD) 755 $(M_GDB_RUNNER) - - $(M_LLDB_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_MOAR) $(SETTING_MOAR) - $(RM_F) $(M_LLDB_RUNNER) -- $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-lldb-m . "lldb" --nqp-lib=blib . blib "$(M_LIBPATH)" "$(NQP_LIBPATH)" -+ $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-lldb-m . "lldb" --nqp-lib=blib . blib "$(NQP_LIBPATH)" - -$(CHMOD) 755 $(M_LLDB_RUNNER) - - $(M_VALGRIND_RUNNER): tools/build/create-moar-runner.p6 $(PERL6_MOAR) $(SETTING_MOAR) - $(RM_F) $(M_VALGRIND_RUNNER) -- $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-valgrind-m . "valgrind" --nqp-lib=blib . blib "$(M_LIBPATH)" "$(NQP_LIBPATH)" -+ $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm perl6-valgrind-m . "valgrind" --nqp-lib=blib . blib "$(NQP_LIBPATH)" - -$(CHMOD) 755 $(M_VALGRIND_RUNNER) - - ## testing targets -@@ -291,9 +290,9 @@ - - m-install: m-all tools/build/create-moar-runner.p6 tools/build/install-core-dist.p6 $(SETTING_MOAR) - $(MKPATH) $(DESTDIR)$(PREFIX)/bin -- $(MKPATH) $(DESTDIR)$(M_LIBPATH)/Perl6 -- $(M_RUN_CLEAN_TARGET_FILES) $(M_PERL6_LANG_OUTPUT) $(DESTDIR)/$(M_LIBPATH)/Perl6 -- $(CP) $(M_PERL6_LANG_OUTPUT) $(DESTDIR)$(M_LIBPATH)/Perl6 -+ $(MKPATH) $(DESTDIR)$(NQP_LIBPATH)/Perl6 -+ $(M_RUN_CLEAN_TARGET_FILES) $(M_PERL6_LANG_OUTPUT) $(DESTDIR)/$(NQP_LIBPATH)/Perl6 -+ $(CP) $(M_PERL6_LANG_OUTPUT) $(DESTDIR)$(NQP_LIBPATH)/Perl6 - $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/lib - $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/runtime - $(M_RUN_CLEAN_TARGET_FILES) $(SETTING_MOAR) $(SETTING_D_MOAR) $(R_SETTING_MOAR) $(DESTDIR)$(PERL6_LANG_DIR)/runtime -@@ -306,13 +305,13 @@ - .@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/vendor - .@slash@$(M_RUNNER) tools/build/upgrade-repository.p6 $(DESTDIR)$(PERL6_LANG_DIR)/site - .@slash@$(M_RUNNER) tools/build/install-core-dist.p6 $(DESTDIR)$(PERL6_LANG_DIR) -- $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-m "$(PERL6_LANG_DIR)/runtime" "" "" "$(M_LIBPATH)" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime" -- $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_LANG_DIR)/runtime" "" "" "$(M_LIBPATH)" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime" -+ $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-m "$(PERL6_LANG_DIR)/runtime" "" "" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime" -+ $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_LANG_DIR)/runtime" "" "" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime" - $(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/perl6-m$(M_BAT) - @m_install@ - - m-runner-default-install: m-install -- $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-m "$(PERL6_LANG_DIR)/runtime" "" "" "$(M_LIBPATH)" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime" -+ $(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-m "$(PERL6_LANG_DIR)/runtime" "" "" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime" - $(CP) $(DESTDIR)$(PREFIX)/bin/perl6-m$(M_BAT) $(DESTDIR)$(PREFIX)/bin/perl6$(M_BAT) - $(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/perl6$(M_BAT) - ---- Configure.pl 2019-03-07 21:56:47.000000000 +0100 -+++ Configure.pl 2019-07-13 02:52:00.727567601 +0200 -@@ -300,9 +300,9 @@ - unless ($win) { - $config{'m_cleanups'} = " \$(M_GDB_RUNNER) \\\n \$(M_LLDB_RUNNER) \\\n \$(M_VALGRIND_RUNNER)"; - $config{'m_all'} = '$(M_GDB_RUNNER) $(M_LLDB_RUNNER) $(M_VALGRIND_RUNNER)'; -- $config{'m_install'} = "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-gdb-m "$(PERL6_LANG_DIR)/runtime" "gdb" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"' . "\n" -- . "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-lldb-m "$(PERL6_LANG_DIR)/runtime" "lldb" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"' . "\n" -- . "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-valgrind-m "$(PERL6_LANG_DIR)/runtime" "valgrind" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"'; -+ $config{'m_install'} = "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-gdb-m "$(PERL6_LANG_DIR)/runtime" "gdb" "" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"' . "\n" -+ . "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-lldb-m "$(PERL6_LANG_DIR)/runtime" "lldb" "" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"' . "\n" -+ . "\t" . '$(M_RUN_PERL6) tools/build/create-moar-runner.p6 "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-valgrind-m "$(PERL6_LANG_DIR)/runtime" "valgrind" "" "$(NQP_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime"'; - } - - unless (@errors) { -# ---- src/vm/moar/ModuleLoaderVMConfig.nqp 2019-07-13 09:11:54.289303931 +0200 -+++ src/vm/moar/ModuleLoaderVMConfig.nqp 2019-07-13 09:12:12.698752142 +0200 -@@ -3,7 +3,7 @@ - my @search_paths; - @search_paths.push(nqp::backendconfig ~ '/perl6/lib'); - # XXX CHEAT: Goes away when we implement :from. -- @search_paths.push(nqp::backendconfig ~ '/nqp/lib'); -+ @search_paths.push(nqp::backendconfig ~ '/nqp'); - # Keep share dir, moarvm has some files there - @search_paths.push(nqp::backendconfig ~ '/share/nqp/lib'); - @search_paths -# ---- src/Perl6/ModuleLoader.nqp 2019-07-13 08:36:14.063089637 +0200 -+++ src/Perl6/ModuleLoader.nqp 2019-07-13 09:25:59.088134877 +0200 -@@ -50,7 +50,7 @@ - my $*MAIN_CTX; - my $file := 'Perl6/BOOTSTRAP' ~ self.file-extension; - my $include := nqp::getcomp('perl6').cli-options; -- $file := ($include ?? $include ~ '/' !! nqp::getcomp('perl6').config ~ '/nqp/lib/') ~ $file; -+ $file := ($include ?? $include ~ '/' !! nqp::backendconfig ~ '/nqp/') ~ $file; - - if nqp::existskey(%modules_loaded, $file) { - return nqp::ctxlexpad(%modules_loaded{$file}); diff --git a/rakudo.spec b/rakudo.spec index ca96a83..5355de4 100644 --- a/rakudo.spec +++ b/rakudo.spec @@ -1,5 +1,5 @@ %global year 2020 -%global month 01 +%global month 02 %global __provides_exclude_from ^.*libperl6_ops_moar\\.so.*$ @@ -161,8 +161,8 @@ rm -f t/08-performance/99-misc.t %changelog -* Thu Jan 30 2020 Gerd Pokorra 0.2020.01-1 -- update to 2020.01 +* Tue Feb 25 2020 Gerd Pokorra 0.2020.02-1 +- update to 2020.02 * Thu Jan 30 2020 Fedora Release Engineering - 0.2019.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 275ab85..e9c5e3e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (rakudo-2020.01.tar.gz) = 6f309da2e5cbfa2eef8bbd54a10e2df6b0f20410465cedf178ba568371c2566e7307ac69b0bd8b2015c8c4f4fbddfea2258f74e06704711952323ad80173b409 +SHA512 (rakudo-2020.02.tar.gz) = dd5d5addc2377f9cc0829012f0e48442926c1d0883ffd4118895083e655f348f233b98803795f1ffc6cfd228034330293a4b94e8a4f30ebcb592581906e7180f SHA512 (rakudo.desk.tar.gz) = 406078bd4323d597e0096b4fb071caa6539bf9ea297abc765b09e21d501a5c8b4c943d2f38e19ff1c7ca24a15809f73f1a2157b058d718a89e0b9b711652a188 SHA512 (macros.perl6) = ff24a327e0b9726f51fe787520aa00b4d564f10efa2a6be6025ec5a98efe585354f17e83953e2f286e75edbcb5d8ca046804fde8d7b58a2dedadafaa673f2f59