[gentoo-commits] repo/gentoo:master commit in: dev-lang/rakudo/files/2015.12/, dev-lang/rakudo/files/
commit: a6a106586ef48d13145bf6f3af33e002e942760a Author: Marshall Brewer (Gentoo Key) sina cn> AuthorDate: Sun May 8 20:41:08 2016 + Commit: Amy Winston gentoo org> CommitDate: Mon May 9 07:06:53 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6a10658 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(-) 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 2dfc05b..000 --- 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 + -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", - ; -
[gentoo-commits] repo/gentoo:master commit in: dev-lang/rakudo/files/2015.12/, dev-lang/rakudo/
commit: 9639bc8346213571665a094657af9f3ea8446db5 Author: Patrick Lauer gentoo org> AuthorDate: Sun Jan 3 13:05:11 2016 + Commit: Patrick Lauer gentoo org> CommitDate: Sun Jan 3 13:05:11 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9639bc83 dev-lang/rakudo: Bump, patches thanks to flussence Package-Manager: portage-2.2.26 dev-lang/rakudo/Manifest | 1 + ...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/rakudo-2015.12.ebuild | 44 5 files changed, 275 insertions(+) diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest index 58499ac..c338461 100644 --- a/dev-lang/rakudo/Manifest +++ b/dev-lang/rakudo/Manifest @@ -6,3 +6,4 @@ DIST rakudo-2015.05.tar.gz 2503009 SHA256 81ecf442e5c1720d8112effc5531f171c83907 DIST rakudo-2015.06.tar.gz 2505308 SHA256 eea69522bc415a2566acb7277db44e5e0df558b3f3d667b64c4e700e917d18fa SHA512 1fb7f6fa42cc71977c26663ae38f5421b390781825e8acd0a0fae9c2781aa06018db3b474a0da43eb519eeb1aed8220df686968e2484272df095e21476b3023d WHIRLPOOL afea51402961a0ca2428a9e8ea5bda48b23b955fb04ad86aeb002b2a387c98931c3e03de24dda247b42a4e00ce772234f52bf6cb76f2951b28f57bef8908b56c DIST rakudo-2015.07.2.tar.gz 2539175 SHA256 1794f2d670af1174aee620587270c05fbc06ef3026ae144daac436101856c492 SHA512 2e487df689c40b45673fc14a66127f893a5b0db13c5747e030dbc4b293cec76114b88909598f2ac7d607e7fe6d8fa632ee0c7386a064da31e76feeec48406d5f WHIRLPOOL bfa2ae4c3f5e24f641eaf8c52d96e61c9cfc48d4ecd9fcacae5a19ed1f60d636d3241fddf2bcbf40df2f2b98add912992c8e955dd237b7583af38c17bbb6713c DIST rakudo-2015.11.tar.gz 2643309 SHA256 a27c8357d06ebfcd1337003c869686f5041aba563a3a8c57bc3c555334e43bc3 SHA512 e4d662709cf47b2b98398c5781973d1abd008f6f13b170fdba418bf36ff552e6c33caee26e2833539828c06ab7562f02cf5e54789f898e2e2d1d31db98d2e95e WHIRLPOOL 22fdaaf616dc62606ca320cb08231b2ae0740e4191f238f2fa26247b2fcd45ae061a2b4f1c616181ea68339a45054751fef0ebab825e98580ecede43c039805e +DIST rakudo-2015.12.tar.gz 2669528 SHA256 f8a57a7b543416c8ea623644f3d74673c4e6c68f3b0161a6b963550ecb74781b SHA512 48e4c98bbff67a52f68a835cc87a19a0b17f2d67790f8162ffd9f167f080d09180d375b5ea9a8577d1de5036c78e604473a2140107d448aff3630c138fd16114 WHIRLPOOL 351ab7ff4b4a1ff00195f913d48f87ef620888cf709e68df5b169f24256d5042bd4a89ef5b3595d9be32ed27cae2e87da9cf3f2585eec0823420be5ee6d8a1a3 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 new file mode 100644 index 000..2dfc05b --- /dev/null +++ b/dev-lang/rakudo/files/2015.12/0001-Fix-make-install-when-nqp-is-distro-installed.patch @@ -0,0 +1,78 @@ +From fb00ed3d71f9407a776c82f03855d1242997878c Mon Sep 17 00:00:00 2001 +From: Anthony Parsons+Date: Sat, 26 Dec 2015 19:37:18 + +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