| 1 |
commit: d366d72d746569159c396a9957a29afc8d56c067 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Jan 28 09:05:09 2017 +0000 |
| 4 |
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 28 11:22:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d366d72d |
| 7 |
|
| 8 |
perl-core/ExtUtils-MakeMaker: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3691 |
| 11 |
|
| 12 |
.../files/6.56-delete_packlist_podlocal.patch | 79 ---------------------- |
| 13 |
.../files/6.58-delete_packlist_podlocal.patch | 76 --------------------- |
| 14 |
.../files/6.62-delete_packlist_podlocal.patch | 76 --------------------- |
| 15 |
.../files/6.82-delete_packlist_podlocal.patch | 59 ---------------- |
| 16 |
.../ExtUtils-MakeMaker/files/RUNPATH-6.54.patch | 17 ----- |
| 17 |
5 files changed, 307 deletions(-) |
| 18 |
|
| 19 |
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index c5763d1..00000000 |
| 22 |
--- a/perl-core/ExtUtils-MakeMaker/files/6.56-delete_packlist_podlocal.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,79 +0,0 @@ |
| 25 |
-Don't install .packlist or perllocal.pod for perl or vendor. |
| 26 |
-Extracted from the debian patchset. |
| 27 |
-See also bug #241834 |
| 28 |
- |
| 29 |
---- |
| 30 |
- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 25 +---------------------- |
| 31 |
- 1 files changed, 1 insertions(+), 24 deletions(-) |
| 32 |
- |
| 33 |
-diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |
| 34 |
-index 239d6df..b4649ee 100644 |
| 35 |
---- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |
| 36 |
-+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |
| 37 |
-@@ -2047,8 +2047,6 @@ doc__install : doc_site_install |
| 38 |
- |
| 39 |
- pure_perl_install :: all |
| 40 |
- $(NOECHO) $(MOD_INSTALL) \ |
| 41 |
-- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ |
| 42 |
-- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ |
| 43 |
- $(INST_LIB) $(DESTINSTALLPRIVLIB) \ |
| 44 |
- $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \ |
| 45 |
- $(INST_BIN) $(DESTINSTALLBIN) \ |
| 46 |
-@@ -2074,8 +2072,6 @@ pure_site_install :: all |
| 47 |
- |
| 48 |
- pure_vendor_install :: all |
| 49 |
- $(NOECHO) $(MOD_INSTALL) \ |
| 50 |
-- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ |
| 51 |
-- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ |
| 52 |
- $(INST_LIB) $(DESTINSTALLVENDORLIB) \ |
| 53 |
- $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \ |
| 54 |
- $(INST_BIN) $(DESTINSTALLVENDORBIN) \ |
| 55 |
-@@ -2084,15 +2080,6 @@ pure_vendor_install :: all |
| 56 |
- $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) |
| 57 |
- |
| 58 |
- doc_perl_install :: all |
| 59 |
-- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 60 |
-- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) |
| 61 |
-- -$(NOECHO) $(DOC_INSTALL) \ |
| 62 |
-- "Module" "$(NAME)" \ |
| 63 |
-- "installed into" "$(INSTALLPRIVLIB)" \ |
| 64 |
-- LINKTYPE "$(LINKTYPE)" \ |
| 65 |
-- VERSION "$(VERSION)" \ |
| 66 |
-- EXE_FILES "$(EXE_FILES)" \ |
| 67 |
-- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 68 |
- |
| 69 |
- doc_site_install :: all |
| 70 |
- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 71 |
-@@ -2106,15 +2093,6 @@ doc_site_install :: all |
| 72 |
- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 73 |
- |
| 74 |
- doc_vendor_install :: all |
| 75 |
-- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 76 |
-- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) |
| 77 |
-- -$(NOECHO) $(DOC_INSTALL) \ |
| 78 |
-- "Module" "$(NAME)" \ |
| 79 |
-- "installed into" "$(INSTALLVENDORLIB)" \ |
| 80 |
-- LINKTYPE "$(LINKTYPE)" \ |
| 81 |
-- VERSION "$(VERSION)" \ |
| 82 |
-- EXE_FILES "$(EXE_FILES)" \ |
| 83 |
-- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 84 |
- |
| 85 |
- }; |
| 86 |
- |
| 87 |
-@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs |
| 88 |
- $(NOECHO) $(NOOP) |
| 89 |
- |
| 90 |
- uninstall_from_perldirs :: |
| 91 |
-- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ |
| 92 |
- |
| 93 |
- uninstall_from_sitedirs :: |
| 94 |
- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ |
| 95 |
- |
| 96 |
- uninstall_from_vendordirs :: |
| 97 |
-- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ |
| 98 |
-+ |
| 99 |
- }; |
| 100 |
- |
| 101 |
- join("",@m); |
| 102 |
--- |
| 103 |
-tg: (b9ce030..) gentoo/MakeMaker-delete_packlist (depends on: upstream) |
| 104 |
|
| 105 |
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch |
| 106 |
deleted file mode 100644 |
| 107 |
index c42d1d2..00000000 |
| 108 |
--- a/perl-core/ExtUtils-MakeMaker/files/6.58-delete_packlist_podlocal.patch |
| 109 |
+++ /dev/null |
| 110 |
@@ -1,76 +0,0 @@ |
| 111 |
-Don't install .packlist or perllocal.pod for perl or vendor. |
| 112 |
-Extracted from the debian patchset. |
| 113 |
-See also bug #241834 |
| 114 |
---- |
| 115 |
- lib/ExtUtils/MM_Unix.pm | 25 +------------------------ |
| 116 |
- 1 files changed, 1 insertions(+), 24 deletions(-) |
| 117 |
- |
| 118 |
-diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm |
| 119 |
-index 10fcdf4..642b677 100644 |
| 120 |
---- a/lib/ExtUtils/MM_Unix.pm |
| 121 |
-+++ b/lib/ExtUtils/MM_Unix.pm |
| 122 |
-@@ -2047,8 +2047,6 @@ doc__install : doc_site_install |
| 123 |
- |
| 124 |
- pure_perl_install :: all |
| 125 |
- $(NOECHO) $(MOD_INSTALL) \ |
| 126 |
-- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ |
| 127 |
-- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ |
| 128 |
- $(INST_LIB) $(DESTINSTALLPRIVLIB) \ |
| 129 |
- $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \ |
| 130 |
- $(INST_BIN) $(DESTINSTALLBIN) \ |
| 131 |
-@@ -2074,8 +2072,6 @@ pure_site_install :: all |
| 132 |
- |
| 133 |
- pure_vendor_install :: all |
| 134 |
- $(NOECHO) $(MOD_INSTALL) \ |
| 135 |
-- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ |
| 136 |
-- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ |
| 137 |
- $(INST_LIB) $(DESTINSTALLVENDORLIB) \ |
| 138 |
- $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \ |
| 139 |
- $(INST_BIN) $(DESTINSTALLVENDORBIN) \ |
| 140 |
-@@ -2084,15 +2080,6 @@ pure_vendor_install :: all |
| 141 |
- $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) |
| 142 |
- |
| 143 |
- doc_perl_install :: all |
| 144 |
-- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 145 |
-- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) |
| 146 |
-- -$(NOECHO) $(DOC_INSTALL) \ |
| 147 |
-- "Module" "$(NAME)" \ |
| 148 |
-- "installed into" "$(INSTALLPRIVLIB)" \ |
| 149 |
-- LINKTYPE "$(LINKTYPE)" \ |
| 150 |
-- VERSION "$(VERSION)" \ |
| 151 |
-- EXE_FILES "$(EXE_FILES)" \ |
| 152 |
-- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 153 |
- |
| 154 |
- doc_site_install :: all |
| 155 |
- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 156 |
-@@ -2106,15 +2093,6 @@ doc_site_install :: all |
| 157 |
- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 158 |
- |
| 159 |
- doc_vendor_install :: all |
| 160 |
-- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 161 |
-- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) |
| 162 |
-- -$(NOECHO) $(DOC_INSTALL) \ |
| 163 |
-- "Module" "$(NAME)" \ |
| 164 |
-- "installed into" "$(INSTALLVENDORLIB)" \ |
| 165 |
-- LINKTYPE "$(LINKTYPE)" \ |
| 166 |
-- VERSION "$(VERSION)" \ |
| 167 |
-- EXE_FILES "$(EXE_FILES)" \ |
| 168 |
-- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 169 |
- |
| 170 |
- }; |
| 171 |
- |
| 172 |
-@@ -2123,13 +2101,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs |
| 173 |
- $(NOECHO) $(NOOP) |
| 174 |
- |
| 175 |
- uninstall_from_perldirs :: |
| 176 |
-- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ |
| 177 |
- |
| 178 |
- uninstall_from_sitedirs :: |
| 179 |
- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ |
| 180 |
- |
| 181 |
- uninstall_from_vendordirs :: |
| 182 |
-- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ |
| 183 |
-+ |
| 184 |
- }; |
| 185 |
- |
| 186 |
- join("",@m); |
| 187 |
|
| 188 |
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch |
| 189 |
deleted file mode 100644 |
| 190 |
index 9d8ee7e..00000000 |
| 191 |
--- a/perl-core/ExtUtils-MakeMaker/files/6.62-delete_packlist_podlocal.patch |
| 192 |
+++ /dev/null |
| 193 |
@@ -1,76 +0,0 @@ |
| 194 |
---- a/lib/ExtUtils/MM_Unix.pm |
| 195 |
-+++ b/lib/ExtUtils/MM_Unix.pm |
| 196 |
-@@ -2052,8 +2052,6 @@ doc__install : doc_site_install |
| 197 |
- |
| 198 |
- pure_perl_install :: all |
| 199 |
- $(NOECHO) $(MOD_INSTALL) \ |
| 200 |
-- read }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ |
| 201 |
-- write }.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \ |
| 202 |
- $(INST_LIB) $(DESTINSTALLPRIVLIB) \ |
| 203 |
- $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \ |
| 204 |
- $(INST_BIN) $(DESTINSTALLBIN) \ |
| 205 |
-@@ -2079,8 +2077,6 @@ pure_site_install :: all |
| 206 |
- |
| 207 |
- pure_vendor_install :: all |
| 208 |
- $(NOECHO) $(MOD_INSTALL) \ |
| 209 |
-- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \ |
| 210 |
-- write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \ |
| 211 |
- $(INST_LIB) $(DESTINSTALLVENDORLIB) \ |
| 212 |
- $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \ |
| 213 |
- $(INST_BIN) $(DESTINSTALLVENDORBIN) \ |
| 214 |
-@@ -2089,37 +2085,19 @@ pure_vendor_install :: all |
| 215 |
- $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) |
| 216 |
- |
| 217 |
- doc_perl_install :: all |
| 218 |
-- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 219 |
-- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) |
| 220 |
-- -$(NOECHO) $(DOC_INSTALL) \ |
| 221 |
-- "Module" "$(NAME)" \ |
| 222 |
-- "installed into" "$(INSTALLPRIVLIB)" \ |
| 223 |
-- LINKTYPE "$(LINKTYPE)" \ |
| 224 |
-- VERSION "$(VERSION)" \ |
| 225 |
-- EXE_FILES "$(EXE_FILES)" \ |
| 226 |
-- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 227 |
- |
| 228 |
- doc_site_install :: all |
| 229 |
-- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 230 |
-- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) |
| 231 |
-+ $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLSITEARCH)/perllocal.pod |
| 232 |
-+ -$(NOECHO) $(MKPATH) $(DESTINSTALLSITEARCH) |
| 233 |
- -$(NOECHO) $(DOC_INSTALL) \ |
| 234 |
- "Module" "$(NAME)" \ |
| 235 |
- "installed into" "$(INSTALLSITELIB)" \ |
| 236 |
- LINKTYPE "$(LINKTYPE)" \ |
| 237 |
- VERSION "$(VERSION)" \ |
| 238 |
- EXE_FILES "$(EXE_FILES)" \ |
| 239 |
-- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 240 |
-+ >> }.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{ |
| 241 |
- |
| 242 |
- doc_vendor_install :: all |
| 243 |
-- $(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod |
| 244 |
-- -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB) |
| 245 |
-- -$(NOECHO) $(DOC_INSTALL) \ |
| 246 |
-- "Module" "$(NAME)" \ |
| 247 |
-- "installed into" "$(INSTALLVENDORLIB)" \ |
| 248 |
-- LINKTYPE "$(LINKTYPE)" \ |
| 249 |
-- VERSION "$(VERSION)" \ |
| 250 |
-- EXE_FILES "$(EXE_FILES)" \ |
| 251 |
-- >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{ |
| 252 |
- |
| 253 |
- }; |
| 254 |
- |
| 255 |
-@@ -2128,13 +2106,12 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs |
| 256 |
- $(NOECHO) $(NOOP) |
| 257 |
- |
| 258 |
- uninstall_from_perldirs :: |
| 259 |
-- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ |
| 260 |
- |
| 261 |
- uninstall_from_sitedirs :: |
| 262 |
- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ |
| 263 |
- |
| 264 |
- uninstall_from_vendordirs :: |
| 265 |
-- $(NOECHO) $(UNINSTALL) }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ |
| 266 |
-+ |
| 267 |
- }; |
| 268 |
- |
| 269 |
- join("",@m); |
| 270 |
|
| 271 |
diff --git a/perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch b/perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch |
| 272 |
deleted file mode 100644 |
| 273 |
index 657a6b6..00000000 |
| 274 |
--- a/perl-core/ExtUtils-MakeMaker/files/6.82-delete_packlist_podlocal.patch |
| 275 |
+++ /dev/null |
| 276 |
@@ -1,59 +0,0 @@ |
| 277 |
---- lib/ExtUtils/MakeMaker.pm.bak 2013-11-25 20:48:18.119741749 +0400 |
| 278 |
-+++ lib/ExtUtils/MakeMaker.pm 2013-11-25 20:49:26.798740829 +0400 |
| 279 |
-@@ -2246,13 +2246,13 @@ |
| 280 |
- When true, suppresses the generation of MYMETA.yml and MYMETA.json module |
| 281 |
- meta-data files during 'perl Makefile.PL'. |
| 282 |
- |
| 283 |
--Defaults to false. |
| 284 |
-+Defaults to true. |
| 285 |
- |
| 286 |
- =item NO_PACKLIST |
| 287 |
- |
| 288 |
- When true, suppresses the writing of C<packlist> files for installs. |
| 289 |
- |
| 290 |
--Defaults to false. |
| 291 |
-+Defaults to true. |
| 292 |
- |
| 293 |
- =item NO_PERLLOCAL |
| 294 |
- |
| 295 |
---- lib/ExtUtils/MM_Unix.pm.bak 2013-11-25 20:48:24.903741658 +0400 |
| 296 |
-+++ lib/ExtUtils/MM_Unix.pm 2013-11-25 20:50:54.662739652 +0400 |
| 297 |
-@@ -1574,6 +1574,16 @@ |
| 298 |
- $self->{FULLEXT} = $self->catdir(split /::/, $self->{NAME}); |
| 299 |
- |
| 300 |
- |
| 301 |
-+ # Workaround for https://bugs.gentoo.org/show_bug.cgi?id=221179 |
| 302 |
-+ if (!exists($self->{NO_PERLLOCAL})) { |
| 303 |
-+ $self->{NO_PERLLOCAL} = 1; |
| 304 |
-+ } |
| 305 |
-+ |
| 306 |
-+ if (!exists($self->{NO_PACKLIST})) { |
| 307 |
-+ $self->{NO_PACKLIST} = 1; |
| 308 |
-+ } |
| 309 |
-+ |
| 310 |
-+ |
| 311 |
- # Copied from DynaLoader: |
| 312 |
- |
| 313 |
- my(@modparts) = split(/::/,$self->{NAME}); |
| 314 |
---- t/basic.t.bak 2013-11-25 20:48:29.919741591 +0400 |
| 315 |
-+++ t/basic.t 2013-11-25 20:51:15.437739373 +0400 |
| 316 |
-@@ -43,7 +43,7 @@ |
| 317 |
- ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy" ) || |
| 318 |
- diag("chdir failed: $!"); |
| 319 |
- |
| 320 |
--my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=../dummy-install"}); |
| 321 |
-+my @mpl_out = run(qq{$perl Makefile.PL "PREFIX=../dummy-install" NO_PERLLOCAL=0 NO_PACKLIST=0}); |
| 322 |
- END { rmtree '../dummy-install'; } |
| 323 |
- |
| 324 |
- cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || |
| 325 |
---- t/INSTALL_BASE.t.bak 2013-11-25 20:48:48.119741347 +0400 |
| 326 |
-+++ t/INSTALL_BASE.t 2013-11-25 20:51:42.549739010 +0400 |
| 327 |
-@@ -35,7 +35,7 @@ |
| 328 |
- |
| 329 |
- ok( chdir('Big-Dummy'), "chdir'd to Big-Dummy") || diag("chdir failed; $!"); |
| 330 |
- |
| 331 |
--my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=../dummy-install"}); |
| 332 |
-+my @mpl_out = run(qq{$perl Makefile.PL "INSTALL_BASE=../dummy-install" NO_PERLLOCAL=0 NO_PACKLIST=0}); |
| 333 |
- END { rmtree '../dummy-install'; } |
| 334 |
- |
| 335 |
- cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || |
| 336 |
\ No newline at end of file |
| 337 |
|
| 338 |
diff --git a/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch b/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch |
| 339 |
deleted file mode 100644 |
| 340 |
index 1385207..00000000 |
| 341 |
--- a/perl-core/ExtUtils-MakeMaker/files/RUNPATH-6.54.patch |
| 342 |
+++ /dev/null |
| 343 |
@@ -1,17 +0,0 @@ |
| 344 |
-diff -Naur ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm |
| 345 |
---- ExtUtils-MakeMaker-6.54/lib/ExtUtils/MM_Any.pm 2009-07-08 11:49:05.000000000 +1200 |
| 346 |
-+++ ExtUtils-MakeMaker-6.54.new/lib/ExtUtils/MM_Any.pm 2009-08-19 21:37:31.494655658 +1200 |
| 347 |
-@@ -1799,6 +1799,13 @@ |
| 348 |
- # LD_RUN_PATH now computed by ExtUtils::Liblist |
| 349 |
- ($self->{EXTRALIBS}, $self->{BSLOADLIBS}, |
| 350 |
- $self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs; |
| 351 |
-+ # We do not want the build root in RPATH |
| 352 |
-+ if (exists $ENV{PORTAGE_TMPDIR}) { |
| 353 |
-+ # If we have PORTAGE_TMPDIR set, strip that, as just testing for |
| 354 |
-+ # /usr and /opt might not be sufficient |
| 355 |
-+ $self->{LD_RUN_PATH} = join ':', grep !/^\Q$ENV{PORTAGE_TMPDIR}/, |
| 356 |
-+ split /:/, $self->{LD_RUN_PATH}; |
| 357 |
-+ } |
| 358 |
- last; |
| 359 |
- } |
| 360 |
- } |
Archives