-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
18 changed files
with
93 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From edde9f24d77c7db1b84054e4491e40cc25ebd626 Mon Sep 17 00:00:00 2001 | ||
From 38dbb0440b9f1fb81fd89b6eef7429bb8de1cc5d Mon Sep 17 00:00:00 2001 | ||
From: Niko Tyni <[email protected]> | ||
Date: Sun, 24 Aug 2014 12:56:11 -0700 | ||
Subject: Pass LD settings through to subdirectories | ||
|
@@ -16,10 +16,10 @@ Patch-Name: debian/makemaker-pasthru.diff | |
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
index da68280917..6d339809ab 100644 | ||
index 97d1738ee7..81fe80b05a 100644 | ||
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
@@ -2927,7 +2927,7 @@ sub pasthru { | ||
@@ -2943,7 +2943,7 @@ sub pasthru { | ||
my($sep) = $Is{VMS} ? ',' : ''; | ||
$sep .= "\\\n\t"; | ||
|
||
|
@@ -29,5 +29,5 @@ index da68280917..6d339809ab 100644 | |
) | ||
{ | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From bf96a15dc0337343166d628ea0b315e7f1c1d2b1 Mon Sep 17 00:00:00 2001 | ||
From 9e5e0c624d395cdfdbdd186b26790cf5f436dd69 Mon Sep 17 00:00:00 2001 | ||
From: Niko Tyni <[email protected]> | ||
Date: Mon, 30 May 2011 22:54:24 +0300 | ||
Subject: Document that CCFLAGS should include $Config{ccflags} | ||
|
@@ -15,10 +15,10 @@ Patch-Name: fixes/document_makemaker_ccflags.diff | |
1 file changed, 4 insertions(+) | ||
|
||
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
index d579256e86..0b154e2419 100644 | ||
index 3d4913eb59..74a7bea6f7 100644 | ||
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm | ||
@@ -1839,6 +1839,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs. | ||
@@ -1838,6 +1838,10 @@ currently used by MakeMaker but may be handy in Makefile.PLs. | ||
String that will be included in the compiler call command line between | ||
the arguments INC and OPTIMIZE. | ||
|
||
|
@@ -30,5 +30,5 @@ index d579256e86..0b154e2419 100644 | |
|
||
Arrayref. E.g. [qw(archname manext)] defines ARCHNAME & MANEXT from | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 47a62c3b4a1435517fa8385fa6f208184e4f2e0a Mon Sep 17 00:00:00 2001 | ||
From 97b90bb183925a67a59b9bc37e8ffe225ecca99a Mon Sep 17 00:00:00 2001 | ||
From: Brendan O'Dea <[email protected]> | ||
Date: Thu, 20 Sep 2007 19:47:14 +1000 | ||
Subject: Document the Net::SMTP 'Port' option | ||
|
@@ -12,10 +12,10 @@ Patch-Name: fixes/net_smtp_docs.diff | |
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/cpan/libnet/lib/Net/SMTP.pm b/cpan/libnet/lib/Net/SMTP.pm | ||
index 0dd966fdf6..4f00349cfa 100644 | ||
index 5eaf4220b6..ff97a27ceb 100644 | ||
--- a/cpan/libnet/lib/Net/SMTP.pm | ||
+++ b/cpan/libnet/lib/Net/SMTP.pm | ||
@@ -756,6 +756,7 @@ Net::SMTP will attempt to extract the address from the value passed. | ||
@@ -754,6 +754,7 @@ Net::SMTP will attempt to extract the address from the value passed. | ||
|
||
B<Debug> - Enable debugging information | ||
|
||
|
@@ -24,5 +24,5 @@ index 0dd966fdf6..4f00349cfa 100644 | |
Example: | ||
|
||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From c647919a0bc84b0836082f2ac1cda69b2e213c72 Mon Sep 17 00:00:00 2001 | ||
From 2ca2716664fa0a78f13be6ccb3e4a6191563a1cb Mon Sep 17 00:00:00 2001 | ||
From: Tom Hukins <[email protected]> | ||
Date: Thu, 8 Sep 2016 16:01:36 +0000 | ||
Subject: Fix parallel building | ||
|
@@ -15,10 +15,10 @@ target fail every time because perl can't load Cwd. | |
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/Makefile.SH b/Makefile.SH | ||
index 469f97da64..e1f805d2c8 100755 | ||
index 71edf8a8f7..47d69e8953 100755 | ||
--- a/Makefile.SH | ||
+++ b/Makefile.SH | ||
@@ -626,7 +626,7 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafile | ||
@@ -627,7 +627,7 @@ all: $(FIRSTMAKEFILE) $(MINIPERL_EXE) $(generated_pods) $(private) $(unidatafile | ||
@echo " "; | ||
@echo " Everything is up to date. Type '$(MAKE) test' to run test suite." | ||
|
||
|
@@ -28,5 +28,5 @@ index 469f97da64..e1f805d2c8 100755 | |
$(RUN_PERL) Porting/manisort -q -o MANIFEST; sh -c true) | ||
@touch $(MANIFEST_SRT) | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 7e189223bee9f34500b2d43275a5d7bb250c8703 Mon Sep 17 00:00:00 2001 | ||
From 837b9b6b67ebb45675990ff6144b95321409a20b Mon Sep 17 00:00:00 2001 | ||
From: Torsten Veller <[email protected]> | ||
Date: Sat, 14 Apr 2012 13:16:34 +0200 | ||
Subject: cpan/ExtUtils-MakeMaker: drop $PORTAGE_TMPDIR from LD_RUN_PATH | ||
|
@@ -11,10 +11,10 @@ Patch-Name: gentoo/EUMM-RUNPATH.diff | |
1 file changed, 7 insertions(+) | ||
|
||
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | ||
index 433a8dd7a3..6f0cd8c630 100644 | ||
index 2bcb4abd69..09cafd6fd9 100644 | ||
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | ||
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | ||
@@ -2422,6 +2422,13 @@ sub init_others { | ||
@@ -2435,6 +2435,13 @@ sub init_others { | ||
# LD_RUN_PATH now computed by ExtUtils::Liblist | ||
($self->{EXTRALIBS}, $self->{BSLOADLIBS}, | ||
$self->{LDLOADLIBS}, $self->{LD_RUN_PATH}) = @libs; | ||
|
@@ -29,5 +29,5 @@ index 433a8dd7a3..6f0cd8c630 100644 | |
} | ||
} | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From a6ead7aae06b1c30596f8e0a851e44b5ea381b61 Mon Sep 17 00:00:00 2001 | ||
From 533acc5a90936292b3f5af5122dc596c66d822ef Mon Sep 17 00:00:00 2001 | ||
From: Kent Fredric <[email protected]> | ||
Date: Sun, 22 Jan 2017 18:58:49 +1300 | ||
Subject: cpan/ExtUtils-MakeMaker: remove targets that generate perllocal.pod | ||
|
@@ -8,10 +8,10 @@ Subject: cpan/ExtUtils-MakeMaker: remove targets that generate perllocal.pod | |
1 file changed, 1 insertion(+), 21 deletions(-) | ||
|
||
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
index 66a24d7838..da68280917 100644 | ||
index 6233513368..97d1738ee7 100644 | ||
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | ||
@@ -2292,16 +2292,6 @@ doc_vendor_install :: all | ||
@@ -2298,16 +2298,6 @@ doc_vendor_install :: all | ||
|
||
push @m, q{ | ||
doc_perl_install :: all | ||
|
@@ -28,7 +28,7 @@ index 66a24d7838..da68280917 100644 | |
doc_site_install :: all | ||
$(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" | ||
-$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" | ||
@@ -2311,19 +2301,9 @@ doc_site_install :: all | ||
@@ -2317,19 +2307,9 @@ doc_site_install :: all | ||
LINKTYPE "$(LINKTYPE)" \ | ||
VERSION "$(VERSION)" \ | ||
EXE_FILES "$(EXE_FILES)" \ | ||
|
@@ -50,5 +50,5 @@ index 66a24d7838..da68280917 100644 | |
|
||
push @m, q{ | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 1b4db70d98faca466277afb0adbd7d74f116a390 Mon Sep 17 00:00:00 2001 | ||
From e785bfb94f09dbaa60e1b75fed1a35ca61d7548a Mon Sep 17 00:00:00 2001 | ||
From: Torsten Veller <[email protected]> | ||
Date: Sun, 15 Apr 2012 08:56:44 +0200 | ||
Subject: aix gcc detection and shared library soname support | ||
|
@@ -19,7 +19,7 @@ Patch-Name: gentoo/aix_soname.diff | |
1 file changed, 20 insertions(+), 12 deletions(-) | ||
|
||
diff --git a/Makefile.SH b/Makefile.SH | ||
index 2cb0010f78..bdf12b272e 100755 | ||
index 57971292d7..3fc9e67aee 100755 | ||
--- a/Makefile.SH | ||
+++ b/Makefile.SH | ||
@@ -86,12 +86,12 @@ true) | ||
|
@@ -54,7 +54,7 @@ index 2cb0010f78..bdf12b272e 100755 | |
;; | ||
esac | ||
shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib" | ||
@@ -916,11 +916,19 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLEXPORT) | ||
@@ -917,11 +917,19 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOADER) $(LIBPERLEXPORT) | ||
!NO!SUBS! | ||
case "$osname" in | ||
aix) | ||
|
@@ -80,5 +80,5 @@ index 2cb0010f78..bdf12b272e 100755 | |
esac | ||
;; | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 13942505c38360bb4ac69a80f0ebd6f90054eb3a Mon Sep 17 00:00:00 2001 | ||
From 0b731e071ee90499063631340db61e8e3ff6a301 Mon Sep 17 00:00:00 2001 | ||
From: Vladimir Smirnov <[email protected]> | ||
Date: Mon, 19 May 2014 19:54:51 +0400 | ||
Subject: Cleanup PATH and shrpenv | ||
|
@@ -13,10 +13,10 @@ Original-By: Torsten Veller <[email protected]> | |
1 file changed, 73 deletions(-) | ||
|
||
diff --git a/Configure b/Configure | ||
index 9d91a81c4f..18b190c372 100755 | ||
index b48aaff46a..1a25c537ee 100755 | ||
--- a/Configure | ||
+++ b/Configure | ||
@@ -110,28 +110,6 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th | ||
@@ -107,28 +107,6 @@ if test -d c:/. || ( uname -a | grep -i 'os\(/\|\)2' 2>&1 ) 2>&1 >/dev/null ; th | ||
fi | ||
fi | ||
|
||
|
@@ -45,7 +45,7 @@ index 9d91a81c4f..18b190c372 100755 | |
: shall we be using ksh? | ||
inksh='' | ||
needksh='' | ||
@@ -8858,57 +8836,6 @@ EOM | ||
@@ -8781,57 +8759,6 @@ EOM | ||
;; | ||
esac | ||
|
||
|
@@ -104,5 +104,5 @@ index 9d91a81c4f..18b190c372 100755 | |
# (For building Perl itself bare -bE:perl.exp is needed, | ||
# Makefile.SH takes care of this.) | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 8efb50eeff8baf9908cb1ebe944b14c85be9b45f Mon Sep 17 00:00:00 2001 | ||
From e76eca582df133418946262aed30d64b080426f8 Mon Sep 17 00:00:00 2001 | ||
From: Vladimir Smirnov <[email protected]> | ||
Date: Mon, 19 May 2014 19:41:49 +0400 | ||
Subject: Set libperl soname | ||
|
@@ -13,7 +13,7 @@ Ported to Perl 5.20 | |
1 file changed, 8 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/Makefile.SH b/Makefile.SH | ||
index bdf12b272e..469f97da64 100755 | ||
index 3fc9e67aee..71edf8a8f7 100755 | ||
--- a/Makefile.SH | ||
+++ b/Makefile.SH | ||
@@ -68,7 +68,7 @@ true) | ||
|
@@ -54,5 +54,5 @@ index bdf12b272e..469f97da64 100755 | |
case "$ldlibpthname" in | ||
'') ;; | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From e76d73638cc810852017e7c45c05de5472fa5268 Mon Sep 17 00:00:00 2001 | ||
From 84a6e16fb282f0be307eb82a57f51c58de442c27 Mon Sep 17 00:00:00 2001 | ||
From: Vladimir Smirnov <[email protected]> | ||
Date: Mon, 19 May 2014 19:59:52 +0400 | ||
Subject: darwin: Use $CC to link | ||
|
@@ -16,7 +16,7 @@ Original-By: Torsten Veller <[email protected]> | |
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/hints/darwin.sh b/hints/darwin.sh | ||
index 690fe4e3ce..1e3cbed30d 100644 | ||
index 56e647825a..741bc5e1f9 100644 | ||
--- a/hints/darwin.sh | ||
+++ b/hints/darwin.sh | ||
@@ -138,7 +138,7 @@ if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then | ||
|
@@ -38,5 +38,5 @@ index 690fe4e3ce..1e3cbed30d 100644 | |
# set the ld to be that explicitly something else. Conversely, | ||
# if the cc is 'cc' (or empty), set the ld to be 'cc'. | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 7f103a9f5717dcda6a1807ae1bdd30c06de3ba71 Mon Sep 17 00:00:00 2001 | ||
From ba4c1584de416a34fbd9257d4a7a127e1c0f7207 Mon Sep 17 00:00:00 2001 | ||
From: Vladimir Smirnov <[email protected]> | ||
Date: Mon, 19 May 2014 19:44:44 +0400 | ||
Subject: Don't force -fstack-protector on everyone | ||
|
@@ -13,10 +13,10 @@ Original by Torsten Veller, ported to perl 5.20 | |
1 file changed, 47 deletions(-) | ||
|
||
diff --git a/Configure b/Configure | ||
index 18b190c372..9639523e06 100755 | ||
index 1a25c537ee..9680a78965 100755 | ||
--- a/Configure | ||
+++ b/Configure | ||
@@ -5484,23 +5484,6 @@ default|recommended) | ||
@@ -5461,23 +5461,6 @@ default|recommended) | ||
# is to add the flag to the flags passed to the compiler at link time, | ||
# as that way the compiler can do the right implementation dependant | ||
# thing. (NWC) | ||
|
@@ -40,7 +40,7 @@ index 18b190c372..9639523e06 100755 | |
esac | ||
|
||
case "$mips_type" in | ||
@@ -5643,21 +5626,6 @@ case "$ldflags" in | ||
@@ -5620,21 +5603,6 @@ case "$ldflags" in | ||
;; | ||
*) dflt="$ldflags";; | ||
esac | ||
|
@@ -62,7 +62,7 @@ index 18b190c372..9639523e06 100755 | |
|
||
: Try to guess additional flags to pick up local libraries. | ||
for thislibdir in $libpth; do | ||
@@ -8611,21 +8579,6 @@ EOM | ||
@@ -8534,21 +8502,6 @@ EOM | ||
''|' ') dflt='none' ;; | ||
esac | ||
|
||
|
@@ -85,5 +85,5 @@ index 18b190c372..9639523e06 100755 | |
. ./myread | ||
case "$ans" in | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 7b5b3540cde2661368250884a57fbaba9b762951 Mon Sep 17 00:00:00 2001 | ||
From c73dfedfd9f791d2c1124bb43862ea124d6962cc Mon Sep 17 00:00:00 2001 | ||
From: Brendan O'Dea <[email protected]> | ||
Date: Tue, 8 Mar 2005 19:30:38 +1100 | ||
Subject: Tweak enc2xs to follow symlinks and ignore missing @INC directories. | ||
|
@@ -16,7 +16,7 @@ Patch-Name: debian/enc2xs_inc.diff | |
1 file changed, 4 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/cpan/Encode/bin/enc2xs b/cpan/Encode/bin/enc2xs | ||
index bd39639ae8..e467518667 100644 | ||
index 619b64b757..050c863ef9 100644 | ||
--- a/cpan/Encode/bin/enc2xs | ||
+++ b/cpan/Encode/bin/enc2xs | ||
@@ -1013,11 +1013,11 @@ use vars qw( | ||
|
@@ -42,7 +42,7 @@ index bd39639ae8..e467518667 100644 | |
warn join("\n", keys %e2x_dir), "\n"; | ||
for my $d (sort {$e2x_dir{$a} <=> $e2x_dir{$b}} keys %e2x_dir){ | ||
$_E2X = $d; | ||
@@ -1094,7 +1094,7 @@ sub make_configlocal_pm { | ||
@@ -1091,7 +1091,7 @@ sub make_configlocal_pm { | ||
$LocalMod{$enc} ||= $mod; | ||
} | ||
}; | ||
|
@@ -52,5 +52,5 @@ index bd39639ae8..e467518667 100644 | |
for my $enc ( sort keys %LocalMod ) { | ||
$_ModLines .= | ||
-- | ||
2.11.0 | ||
2.14.3 | ||
|
Oops, something went wrong.