From a6a106586ef48d13145bf6f3af33e002e942760a Mon Sep 17 00:00:00 2001 From: "Marshall Brewer (Gentoo Key)" Date: Sun, 8 May 2016 22:41:08 +0200 Subject: dev-lang/rakudo: remove unneeded patches --- ...make-install-when-nqp-is-distro-installed.patch | 78 ------------- .../0002-Add-RAKUDO_PRECOMP_PREFIX-env-var.patch | 27 ----- ...e-and-complete-the-manpage-s-env-var-list.patch | 125 --------------------- dev-lang/rakudo/files/jakudo-fix-paths.patch | 23 ---- 4 files changed, 253 deletions(-) delete mode 100644 dev-lang/rakudo/files/2015.12/0001-Fix-make-install-when-nqp-is-distro-installed.patch delete mode 100644 dev-lang/rakudo/files/2015.12/0002-Add-RAKUDO_PRECOMP_PREFIX-env-var.patch delete mode 100644 dev-lang/rakudo/files/2015.12/0003-Rewrite-and-complete-the-manpage-s-env-var-list.patch delete mode 100644 dev-lang/rakudo/files/jakudo-fix-paths.patch (limited to 'dev-lang/rakudo/files') diff --git a/dev-lang/rakudo/files/2015.12/0001-Fix-make-install-when-nqp-is-distro-installed.patch b/dev-lang/rakudo/files/2015.12/0001-Fix-make-install-when-nqp-is-distro-installed.patch deleted file mode 100644 index 2dfc05b7463c..000000000000 --- a/dev-lang/rakudo/files/2015.12/0001-Fix-make-install-when-nqp-is-distro-installed.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fb00ed3d71f9407a776c82f03855d1242997878c Mon Sep 17 00:00:00 2001 -From: Anthony Parsons -Date: Sat, 26 Dec 2015 19:37:18 +0000 -Subject: [PATCH] Fix `make install` when nqp is distro-installed -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -During the installation process, tools/build/install-core-dist.pl is called to -precompile the bundled non-CORE.setting libraries such as Test.pm. The way this -was initially coded, it pulled the install path from NQP's build-time -configuration, which will be a root-owned filesystem path if NQP was installed -via a system package manager. - -Other parts of the CompUnit code will see these paths don't exist, and attempt -to helpfully call `mkdir` on them which brings the whole process to a messy end. -This part usually works fine when building everything from a git checkout, -because Moar/NQP/Rakudo all default to an installation prefix the user has write -access to. - -This patch fixes that step of the build process by passing the makefile's path -prefixes to install-core-dist.pl (ensuring precompilation output goes to the -right place), and modifying it to *only* use that path (ensuring it doesn't try -to mkdir where it shouldn't). This isn't a 100% solution, but it fixes enough -to unblock packaging work on a few distros. - -Thanks to mst++ for doing almost all of the legwork here, crux++ for an initial -patch that gave us a few pointers to work from, and nine++ for giving us some -Boxing Day fun ☺ ---- - tools/build/Makefile-JVM.in | 2 +- - tools/build/Makefile-Moar.in | 2 +- - tools/build/install-core-dist.pl | 3 ++- - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in -index 11e17810265d..0a3095114e0a 100644 ---- a/tools/build/Makefile-JVM.in -+++ b/tools/build/Makefile-JVM.in -@@ -391,7 +391,7 @@ j-install: j-all tools/build/create-jvm-runner.pl tools/build/install-core-dist. - $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/resources - $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/bin - $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/short -- .@slash@$(J_RUNNER) tools/build/install-core-dist.pl -+ .@slash@$(J_RUNNER) tools/build/install-core-dist.pl $(DESTDIR)$(PERL6_LANG_DIR) - $(PERL) tools/build/create-jvm-runner.pl install "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) $(NQP_JARS) - $(PERL) tools/build/create-jvm-runner.pl install-debug "$(DESTDIR)" $(PREFIX) $(NQP_PREFIX) $(NQP_JARS) - -diff --git a/tools/build/Makefile-Moar.in b/tools/build/Makefile-Moar.in -index 1e586d92a1fa..670b89c20774 100644 ---- a/tools/build/Makefile-Moar.in -+++ b/tools/build/Makefile-Moar.in -@@ -246,7 +246,7 @@ m-install: m-all tools/build/create-moar-runner.pl tools/build/install-core-dist - $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/resources - $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/bin - $(MKPATH) $(DESTDIR)$(PERL6_LANG_DIR)/site/short -- .@slash@$(M_RUNNER) tools/build/install-core-dist.pl -+ .@slash@$(M_RUNNER) tools/build/install-core-dist.pl $(DESTDIR)$(PERL6_LANG_DIR) - $(PERL) tools/build/create-moar-runner.pl "$(MOAR)" perl6.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-m "$(PERL6_LANG_DIR)/runtime" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime" - $(PERL) tools/build/create-moar-runner.pl "$(MOAR)" perl6-debug.moarvm $(DESTDIR)$(PREFIX)/bin/perl6-debug-m "$(PERL6_LANG_DIR)/runtime" "" "$(M_LIBPATH)" "$(PERL6_LANG_DIR)/lib" "$(PERL6_LANG_DIR)/runtime" - $(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/perl6-m$(M_BAT) -diff --git a/tools/build/install-core-dist.pl b/tools/build/install-core-dist.pl -index 0990b2676a10..ba14b20828d8 100644 ---- a/tools/build/install-core-dist.pl -+++ b/tools/build/install-core-dist.pl -@@ -9,7 +9,8 @@ my %provides = - "experimental" => "lib/experimental.pm6", - ; - --CompUnit::RepositoryRegistry.repository-for-name('perl').install( -+PROCESS::<$REPO> := CompUnit::RepositoryRegistry.repository-for-spec("inst#@*ARGS[0]"); -+$*REPO.install( - Distribution.new( - name => "CORE", - auth => "perl", --- -2.6.4 - diff --git a/dev-lang/rakudo/files/2015.12/0002-Add-RAKUDO_PRECOMP_PREFIX-env-var.patch b/dev-lang/rakudo/files/2015.12/0002-Add-RAKUDO_PRECOMP_PREFIX-env-var.patch deleted file mode 100644 index 1c5f1af2c817..000000000000 --- a/dev-lang/rakudo/files/2015.12/0002-Add-RAKUDO_PRECOMP_PREFIX-env-var.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4fe18ce14c87c4d63f18db3c38cf32733ba72c31 Mon Sep 17 00:00:00 2001 -From: Anthony Parsons -Date: Sun, 27 Dec 2015 02:02:22 +0000 -Subject: [PATCH 2/2] Add RAKUDO_PRECOMP_PREFIX env var - -As suggested by nine++, with some name tweaking ---- - docs/running.pod | 6 ++++++ - src/core/CompUnit/RepositoryRegistry.pm | 2 +- - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/core/CompUnit/RepositoryRegistry.pm b/src/core/CompUnit/RepositoryRegistry.pm -index f70f22105849..e628ee659c7c 100644 ---- a/src/core/CompUnit/RepositoryRegistry.pm -+++ b/src/core/CompUnit/RepositoryRegistry.pm -@@ -75,7 +75,7 @@ class CompUnit::RepositoryRegistry { - } - #?endif - -- my $prefix := nqp::p6box_s( -+ my $prefix := %*ENV // nqp::p6box_s( - nqp::concat(nqp::atkey(nqp::backendconfig,'prefix'),'/share/perl6') - ); - --- -2.6.4 - diff --git a/dev-lang/rakudo/files/2015.12/0003-Rewrite-and-complete-the-manpage-s-env-var-list.patch b/dev-lang/rakudo/files/2015.12/0003-Rewrite-and-complete-the-manpage-s-env-var-list.patch deleted file mode 100644 index 3b43b625de5b..000000000000 --- a/dev-lang/rakudo/files/2015.12/0003-Rewrite-and-complete-the-manpage-s-env-var-list.patch +++ /dev/null @@ -1,125 +0,0 @@ -From c6d759c5df9ae4cb539717ecba99f80efe35d9ac Mon Sep 17 00:00:00 2001 -From: Anthony Parsons -Date: Sun, 27 Dec 2015 01:28:19 +0000 -Subject: [PATCH 1/2] Rewrite and complete the manpage's env var list - -This includes everything I could find with an `ack 'ENV<' src/` command. -Descriptions have been expanded on, expected datatypes are shown, and items are -now broken up into categories. ---- - docs/running.pod | 81 +++++++++++++++++++++++++++++++++++++++++++++----------- - 1 file changed, 66 insertions(+), 15 deletions(-) - -diff --git a/docs/running.pod b/docs/running.pod -index 9ed7571df54e..53fb577c8481 100644 ---- a/docs/running.pod -+++ b/docs/running.pod -@@ -44,39 +44,90 @@ The supported values for C<--target> are: - For C<--profile-filename>, specifying a name ending in C<.json> will write a raw JSON profile dump. - The default if this is omitted is C.html>. - --=head1 List of env vars used in Rakudo -+=head1 ENVIRONMENT VARIABLES -+ -+Rakudo's behavior can be tweaked by a (growing) number of environment variables; this section -+attempts to document all those currently in use. -+ -+=head2 Module Loading -+ -+=over -+ -+=item C, C (I; F) -+ -+Appends a comma-delimited list of paths to C<@INC>. C is evaluated first. -+ -+=item C (I; F) -+ -+Causes the module loader to print debugging information to standard error. -+ -+=back -+ -+=head2 Error Message Verbosity and Strictness - - =over - --=item C, C (src/core/Inc.pm) -+=item C (I; F) -+ -+If true, suppresses deprecation warnings triggered by the C trait. - --Appends a delimited list of paths to C<@INC>. C is evaluated first. -+=item C (I; F) - --=item C (src/Perl6/ModuleLoader.pm) -+If true, deprecation warnings become thrown exceptions. - --If set to a non-false value, causes the module loader to print debugging information to standard --error. -+=item C (I; F) - --=item C (src/core/Exception.pm) -+Displays source code in stack frames surrounded by the specified number of lines of context. -+ -+=item C (I; F) -+ -+Controls whether .setting files are included in backtraces. -+ -+=back -+ -+=head2 Affecting Precompilation -+ -+=over -+ -+=item C (F) -+ -+=item C (F) -+ -+=item C (F) -+ -+These are internal variables for passing serialized state to precompilation jobs in child processes. -+Please do not set them manually. -+ -+=back -+ -+=head2 Other -+ -+=over -+ -+=item C (I; F) - - Controls whether to emit ANSI codes for error highlighting. Defaults to true if unset, except on - Win32. - --=item C (src/core/ThreadPoolScheduler.pm) -+=item C (I; F) - --Controls the maximum number of threads used by a thread pool. -+Override the default maximum number of threads used by a thread pool. - --=item C (src/core/Deprecations.pm) -+=item C, C, C (I; F) - --If set, suppresses deprecation warnings. -+The C method will return C<$TMPDIR> if it points to a directory with full -+access permissions for the current user, with a fallback default of C<'/tmp'>. - --=item C (src/core/Backtrace.pm) -+C and C use more Win32-appropriate lists which also include the -+C<%TEMP%> and C<%TMP%> environment variables. - --Controls stack frame verbosity. -+=item C, C (I; F) - --=item C (src/core/Backtrace.pm) -+The C method splits C<$PATH> as a shell would; i.e. as a colon-separated list. -+C inherits this from C. - --Controls whether .setting files are included in backtraces. -+C will read the first defined of either C<%PATH%> or C<%Path%> as a -+semicolon-delimited list. - - =back - --- -2.6.4 - diff --git a/dev-lang/rakudo/files/jakudo-fix-paths.patch b/dev-lang/rakudo/files/jakudo-fix-paths.patch deleted file mode 100644 index dc75407d1182..000000000000 --- a/dev-lang/rakudo/files/jakudo-fix-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit b9f993b86acf0f1ca3108d1b799ca35c21e726c7 -Author: Tobias Leich -Date: Tue May 26 20:27:50 2015 +0200 - - dont create dirs when instanciating CUR - - But also do not skip non-existing locations, because we might be - creating them when installing into. - -diff --git a/src/core/CompUnitRepo/Locally.pm b/src/core/CompUnitRepo/Locally.pm -index 72a7eca..5acffca 100644 ---- a/src/core/CompUnitRepo/Locally.pm -+++ b/src/core/CompUnitRepo/Locally.pm -@@ -7,9 +7,7 @@ role CompUnitRepo::Locally { - - method new(CompUnitRepo::Locally: $dir) { - my $abspath := $*SPEC.rel2abs($dir); -- try mkdir $abspath; - my $IO := IO::Path.new-from-absolute-path($abspath); -- return Nil unless $IO.d and $IO.r; - - %instances{$abspath} //= - self.bless(:$IO,:lock(Lock.new),:WHICH(self.^name ~ '|' ~ $abspath)); -- cgit v1.2.3-65-gdbad