1 |
commit: 9167673ab0a0d03f1c92760278227feed27a8f99 |
2 |
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 24 05:48:28 2017 +0000 |
4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 24 06:19:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9167673a |
7 |
|
8 |
dev-perl/PDL: Backport configure/compile fix for '.' in @INC |
9 |
|
10 |
5.26 breaks confingure/compilation due to removal of implicit '.' in |
11 |
@INC. |
12 |
|
13 |
However, there are too many changes in 2.018 for me to bump it properly |
14 |
at this time, and its more important to fix regressions before we unmask |
15 |
Perl 5.26, without having to consider the side effects of all upstreams |
16 |
other changes breaking code. |
17 |
|
18 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
19 |
|
20 |
dev-perl/PDL/PDL-2.17.0.ebuild | 1 + |
21 |
dev-perl/PDL/files/PDL-2.17.0-dot-in-inc.patch | 142 +++++++++++++++++++++++++ |
22 |
2 files changed, 143 insertions(+) |
23 |
|
24 |
diff --git a/dev-perl/PDL/PDL-2.17.0.ebuild b/dev-perl/PDL/PDL-2.17.0.ebuild |
25 |
index 4b8fe1c6fa1..3dd7ad96511 100644 |
26 |
--- a/dev-perl/PDL/PDL-2.17.0.ebuild |
27 |
+++ b/dev-perl/PDL/PDL-2.17.0.ebuild |
28 |
@@ -60,6 +60,7 @@ PATCHES=( |
29 |
"${FILESDIR}"/${PN}-2.17.0-makemakerfix.patch |
30 |
"${FILESDIR}"/${PN}-2.17.0-fortran.patch # respect user choice for fortran compiler+flags, add pic |
31 |
"${FILESDIR}"/${PN}-2.17.0-shared-hdf.patch # search for shared hdf instead of static |
32 |
+ "${FILESDIR}"/${PN}-2.17.0-dot-in-inc.patch # fix broken Perl 5.26 compile due to @INC changes |
33 |
) |
34 |
|
35 |
pkg_setup() { |
36 |
|
37 |
diff --git a/dev-perl/PDL/files/PDL-2.17.0-dot-in-inc.patch b/dev-perl/PDL/files/PDL-2.17.0-dot-in-inc.patch |
38 |
new file mode 100644 |
39 |
index 00000000000..0007f47b91d |
40 |
--- /dev/null |
41 |
+++ b/dev-perl/PDL/files/PDL-2.17.0-dot-in-inc.patch |
42 |
@@ -0,0 +1,142 @@ |
43 |
+From 717a19da57ec9f8fc80d4824cad47a04200fc515 Mon Sep 17 00:00:00 2001 |
44 |
+From: Kent Fredric <kentfredric@×××××.com> |
45 |
+Date: Sat, 24 Jun 2017 17:27:27 +1200 |
46 |
+Subject: [PATCH] Backport fix for "." in @INC from 2.018 |
47 |
+ |
48 |
+2.018 has far too many changes to safely review in such a short amount |
49 |
+of time. Fixing this trivial build issue gets us what is necessary |
50 |
+for Perl 5.26 roll-out without lots of additional verification |
51 |
+--- |
52 |
+ Basic/Core/Core.xs | 2 +- |
53 |
+ Basic/Core/pdl.h.PL | 2 +- |
54 |
+ Basic/Core/pdlconv.c.PL | 4 ++-- |
55 |
+ Basic/Core/pdlcore.c.PL | 4 ++-- |
56 |
+ Basic/Core/pdlcore.h.PL | 4 ++-- |
57 |
+ Basic/Core/pdlsimple.h.PL | 2 +- |
58 |
+ Makefile.PL | 4 ++-- |
59 |
+ 7 files changed, 11 insertions(+), 11 deletions(-) |
60 |
+ |
61 |
+diff --git a/Basic/Core/Core.xs b/Basic/Core/Core.xs |
62 |
+index 5e95356..b38f14c 100644 |
63 |
+--- a/Basic/Core/Core.xs |
64 |
++++ b/Basic/Core/Core.xs |
65 |
+@@ -336,7 +336,7 @@ iscontig(x) |
66 |
+ |
67 |
+ # using "perl" not $^X because that doesn't work on "perl in space" |
68 |
+ # TODO: switching back to $^X since using "perl" is not a viable fix |
69 |
+-INCLUDE_COMMAND: $^X -e "require q{Dev.pm}; PDL::Core::Dev::generate_core_flags()" |
70 |
++INCLUDE_COMMAND: $^X -e "require q{./Dev.pm}; PDL::Core::Dev::generate_core_flags()" |
71 |
+ |
72 |
+ #if 0 |
73 |
+ =begin windows_mmap |
74 |
+diff --git a/Basic/Core/pdl.h.PL b/Basic/Core/pdl.h.PL |
75 |
+index d2e9758..6e01445 100644 |
76 |
+--- a/Basic/Core/pdl.h.PL |
77 |
++++ b/Basic/Core/pdl.h.PL |
78 |
+@@ -6,7 +6,7 @@ use Config; |
79 |
+ use File::Basename qw(&basename &dirname); |
80 |
+ |
81 |
+ # how many variable types (ie PDL_Byte, ...) are there? |
82 |
+-require 'Types.pm'; |
83 |
++require './Types.pm'; |
84 |
+ my $ntypes = $#PDL::Types::names; |
85 |
+ my $PDL_DATATYPES = PDL::Types::datatypes_header(); |
86 |
+ |
87 |
+diff --git a/Basic/Core/pdlconv.c.PL b/Basic/Core/pdlconv.c.PL |
88 |
+index 160e29b..62a57b0 100644 |
89 |
+--- a/Basic/Core/pdlconv.c.PL |
90 |
++++ b/Basic/Core/pdlconv.c.PL |
91 |
+@@ -7,9 +7,9 @@ use strict; |
92 |
+ use Config; |
93 |
+ use File::Basename qw(&basename &dirname); |
94 |
+ |
95 |
+-require 'Dev.pm'; PDL::Core::Dev->import; |
96 |
++require './Dev.pm'; PDL::Core::Dev->import; |
97 |
+ use vars qw( %PDL_DATATYPES ); |
98 |
+-require 'Types.pm'; #for typesrtkeys |
99 |
++require './Types.pm'; #for typesrtkeys |
100 |
+ |
101 |
+ # This forces PL files to create target in same directory as PL file. |
102 |
+ # This is so that make depend always knows where to find PL derivatives. |
103 |
+diff --git a/Basic/Core/pdlcore.c.PL b/Basic/Core/pdlcore.c.PL |
104 |
+index a602b6e..445cfb8 100644 |
105 |
+--- a/Basic/Core/pdlcore.c.PL |
106 |
++++ b/Basic/Core/pdlcore.c.PL |
107 |
+@@ -6,7 +6,7 @@ use strict; |
108 |
+ use Config; |
109 |
+ use File::Basename qw(&basename &dirname); |
110 |
+ |
111 |
+-require 'Dev.pm'; PDL::Core::Dev->import; |
112 |
++require './Dev.pm'; PDL::Core::Dev->import; |
113 |
+ use vars qw( %PDL_DATATYPES ); |
114 |
+ |
115 |
+ # check for bad value support |
116 |
+@@ -14,7 +14,7 @@ require './Config.pm'; # to load the PDL not the Perl one |
117 |
+ die "No PDL::Config found" unless %PDL::Config; |
118 |
+ my $bvalflag = $PDL::Config{WITH_BADVAL}; |
119 |
+ my $usenan = $PDL::Config{BADVAL_USENAN}; |
120 |
+-require 'Types.pm'; |
121 |
++require './Types.pm'; |
122 |
+ PDL::Types->import(':All'); |
123 |
+ |
124 |
+ |
125 |
+diff --git a/Basic/Core/pdlcore.h.PL b/Basic/Core/pdlcore.h.PL |
126 |
+index 90469f0..760e6a1 100644 |
127 |
+--- a/Basic/Core/pdlcore.h.PL |
128 |
++++ b/Basic/Core/pdlcore.h.PL |
129 |
+@@ -11,7 +11,7 @@ use strict; |
130 |
+ use Config; |
131 |
+ use File::Basename qw(&basename &dirname); |
132 |
+ |
133 |
+-require 'Dev.pm'; PDL::Core::Dev->import; |
134 |
++require './Dev.pm'; PDL::Core::Dev->import; |
135 |
+ use vars qw( %PDL_DATATYPES ); |
136 |
+ |
137 |
+ # version 2 is for versions after PDL 2.1.1 |
138 |
+@@ -349,7 +349,7 @@ double NaN_double; |
139 |
+ |
140 |
+ # fortunately it looks like Types.pm.PL is processed before this |
141 |
+ # file |
142 |
+- require "Types.pm"; # ie PDL::Types |
143 |
++ require "./Types.pm"; # ie PDL::Types |
144 |
+ |
145 |
+ for (PDL::Types::typesrtkeys()) { |
146 |
+ my $ctype = $PDL::Types::typehash{$_}{ctype}; |
147 |
+diff --git a/Basic/Core/pdlsimple.h.PL b/Basic/Core/pdlsimple.h.PL |
148 |
+index e511913..43eb557 100644 |
149 |
+--- a/Basic/Core/pdlsimple.h.PL |
150 |
++++ b/Basic/Core/pdlsimple.h.PL |
151 |
+@@ -3,7 +3,7 @@ |
152 |
+ use Config; |
153 |
+ use File::Basename qw(&basename &dirname); |
154 |
+ |
155 |
+-require 'Types.pm'; |
156 |
++require './Types.pm'; |
157 |
+ my $PDL_DATATYPES = PDL::Types::datatypes_header(); |
158 |
+ |
159 |
+ # List explicitly here the variables you want Configure to |
160 |
+diff --git a/Makefile.PL b/Makefile.PL |
161 |
+index fc8d590..a94d895 100644 |
162 |
+--- a/Makefile.PL |
163 |
++++ b/Makefile.PL |
164 |
+@@ -226,7 +226,7 @@ sub check_f77conf { |
165 |
+ |
166 |
+ sub make_Version_pm { |
167 |
+ # Get Version from Basic/PDL.pm and generated Basic/Core/Version.pm from it |
168 |
+- require 'Basic/PDL.pm'; |
169 |
++ require './Basic/PDL.pm'; |
170 |
+ # keep version info in $PDL::Config |
171 |
+ $PDL::Config{PDL_BUILD_VERSION} = "$PDL::VERSION"; |
172 |
+ |
173 |
+@@ -376,7 +376,7 @@ make_Types_pm(); |
174 |
+ # this will make PDL::Core::Dev's functions available |
175 |
+ # in Makefile.PL files in all subdirectories |
176 |
+ # IMPORTANT: it has to be after make_Types_pm() |
177 |
+-require "Basic/Core/Dev.pm"; PDL::Core::Dev->import(); |
178 |
++require "./Basic/Core/Dev.pm"; PDL::Core::Dev->import(); |
179 |
+ |
180 |
+ # only perform one test if required modules are missing |
181 |
+ # the test will print an informational message and fail |
182 |
+-- |
183 |
+2.13.1 |
184 |
+ |