From 1d269ea023461a444204cfa1ecb914b88c590b9c Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Fri, 26 Jun 2020 17:26:25 +1200 Subject: [PATCH] Bundle -Dgentoolibdirs patch --- ...-Add-support-for-Dgentoolibdirs.patch.desc | 1 + patches/0001-Fix-hpux-hints.patch | 2 +- ...on-and-shared-library-soname-support.patch | 2 +- ...keMaker-drop-PORTAGE_TMPDIR-from-LD_.patch | 2 +- ...path-and-append-LDFLAGS-to-lddlflags.patch | 2 +- .../0005-Add-headers-for-opensolaris.patch | 2 +- ...ist-packaged-patches-in-patchlevel.h.patch | 2 +- patches/0007-Cleanup-PATH-and-shrpenv.patch | 2 +- ...follow-symlinks-and-ignore-missing-I.patch | 2 +- patches/0009-darwin-Use-CC-to-link.patch | 2 +- ...le-INSTALLDIRS-default-for-modules-i.patch | 2 +- patches/0011-Fix-interix-hints.patch | 2 +- patches/0012-Set-libperl-soname.patch | 2 +- patches/0013-Add-etc-perl-to-INC.patch | 2 +- ...keMaker-remove-targets-that-generate.patch | 2 +- ...t-force-fstack-protector-on-everyone.patch | 2 +- ...set-custom-CFLAGS-in-cpan-Digest-SHA.patch | 2 +- ...include-sources-in-usr-local-for-com.patch | 2 +- ...n-IO-Socket-IP-Disable-network-tests.patch | 2 +- patches/0019-Fix-EUMM-podlocal-tests.patch | 2 +- .../0020-Skip-auto-linking-nsl-and-cl.patch | 2 +- ...tests-which-create-fun-false-failure.patch | 2 +- ...s-tests-which-fails-under-sandboxing.patch | 2 +- ...me-defaults-with-nonexisting-site-di.patch | 2 +- ...D-settings-through-to-subdirectories.patch | 2 +- ...-respect-nstore-option-not-respected.patch | 2 +- ...rs-for-man-pages-from-standard-input.patch | 2 +- ...27-Respect-umask-during-installation.patch | 2 +- ...CFLAGS-should-include-Config-ccflags.patch | 2 +- patches/0029-Fix-parallel-building.patch | 2 +- .../0030-Add-support-for-Dgentoolibdirs.patch | 400 ++++++++++++++++++ 31 files changed, 430 insertions(+), 29 deletions(-) create mode 100644 patch-info/0030-Add-support-for-Dgentoolibdirs.patch.desc create mode 100644 patches/0030-Add-support-for-Dgentoolibdirs.patch diff --git a/patch-info/0030-Add-support-for-Dgentoolibdirs.patch.desc b/patch-info/0030-Add-support-for-Dgentoolibdirs.patch.desc new file mode 100644 index 0000000..f675ae2 --- /dev/null +++ b/patch-info/0030-Add-support-for-Dgentoolibdirs.patch.desc @@ -0,0 +1 @@ +Add support for -Dgentoolibdirs \ No newline at end of file diff --git a/patches/0001-Fix-hpux-hints.patch b/patches/0001-Fix-hpux-hints.patch index 379f119..f0ecd21 100644 --- a/patches/0001-Fix-hpux-hints.patch +++ b/patches/0001-Fix-hpux-hints.patch @@ -1,7 +1,7 @@ From 043e1e2761e650177fbafa873c226354b3f17146 Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sun, 15 Apr 2012 09:27:19 +0200 -Subject: [PATCH 01/29] Fix hpux hints +Subject: [PATCH 01/30] Fix hpux hints do not assume '.' being in PATH on hpux, use 'gcc' as linker, link with '-lm'. diff --git a/patches/0002-aix-gcc-detection-and-shared-library-soname-support.patch b/patches/0002-aix-gcc-detection-and-shared-library-soname-support.patch index cde1469..4b51b7c 100644 --- a/patches/0002-aix-gcc-detection-and-shared-library-soname-support.patch +++ b/patches/0002-aix-gcc-detection-and-shared-library-soname-support.patch @@ -1,7 +1,7 @@ From 1e0213aaaa2835a3d0b472f7ddf7013daa2338f0 Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sun, 15 Apr 2012 08:56:44 +0200 -Subject: [PATCH 02/29] aix gcc detection and shared library soname support +Subject: [PATCH 02/30] aix gcc detection and shared library soname support 1) Match "powerpc-ibm-aix5.3.0.0-gcc" as gcc too. diff --git a/patches/0003-cpan-ExtUtils-MakeMaker-drop-PORTAGE_TMPDIR-from-LD_.patch b/patches/0003-cpan-ExtUtils-MakeMaker-drop-PORTAGE_TMPDIR-from-LD_.patch index 48fcdf9..5c3e632 100644 --- a/patches/0003-cpan-ExtUtils-MakeMaker-drop-PORTAGE_TMPDIR-from-LD_.patch +++ b/patches/0003-cpan-ExtUtils-MakeMaker-drop-PORTAGE_TMPDIR-from-LD_.patch @@ -1,7 +1,7 @@ From 3d4fea89df2d4bc74b89a88e8686eac951438cb8 Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sat, 14 Apr 2012 13:16:34 +0200 -Subject: [PATCH 03/29] cpan/ExtUtils-MakeMaker: drop $PORTAGE_TMPDIR from +Subject: [PATCH 03/30] cpan/ExtUtils-MakeMaker: drop $PORTAGE_TMPDIR from LD_RUN_PATH Bug-Gentoo: https://bugs.gentoo.org/105054 diff --git a/patches/0004-Remove-rpath-and-append-LDFLAGS-to-lddlflags.patch b/patches/0004-Remove-rpath-and-append-LDFLAGS-to-lddlflags.patch index cb4c6f2..9b2cbe0 100644 --- a/patches/0004-Remove-rpath-and-append-LDFLAGS-to-lddlflags.patch +++ b/patches/0004-Remove-rpath-and-append-LDFLAGS-to-lddlflags.patch @@ -1,7 +1,7 @@ From f846b901099c258dd9377916939a9987d5c1debd Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sat, 14 Apr 2012 13:31:17 +0200 -Subject: [PATCH 04/29] Remove -rpath and append LDFLAGS to lddlflags +Subject: [PATCH 04/30] Remove -rpath and append LDFLAGS to lddlflags Patch-Name: gentoo/config_over.diff --- diff --git a/patches/0005-Add-headers-for-opensolaris.patch b/patches/0005-Add-headers-for-opensolaris.patch index 5f3e0d5..d9c69c6 100644 --- a/patches/0005-Add-headers-for-opensolaris.patch +++ b/patches/0005-Add-headers-for-opensolaris.patch @@ -1,7 +1,7 @@ From 67bd66a3efd873cf55a4c82b33905060e790ece4 Mon Sep 17 00:00:00 2001 From: Vladimir Smirnov Date: Mon, 19 May 2014 19:50:12 +0400 -Subject: [PATCH 05/29] Add headers for opensolaris +Subject: [PATCH 05/30] Add headers for opensolaris Thanks to the nice OpenSolaris guys, I finally figured out that on OpenSolaris 11, the header dependencies have changed. diff --git a/patches/0006-List-packaged-patches-in-patchlevel.h.patch b/patches/0006-List-packaged-patches-in-patchlevel.h.patch index 5eaaf08..8bbe376 100644 --- a/patches/0006-List-packaged-patches-in-patchlevel.h.patch +++ b/patches/0006-List-packaged-patches-in-patchlevel.h.patch @@ -1,7 +1,7 @@ From cb5572c436b231b0d4608568a9eafbba95ae9831 Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sat, 14 Apr 2012 18:11:54 +0200 -Subject: [PATCH 06/29] List packaged patches in patchlevel.h +Subject: [PATCH 06/30] List packaged patches in patchlevel.h The list of packaged patches is in patchlevel-gentoo.h, which is generated from the patches/ directory when building the package. diff --git a/patches/0007-Cleanup-PATH-and-shrpenv.patch b/patches/0007-Cleanup-PATH-and-shrpenv.patch index ab26905..b115bfc 100644 --- a/patches/0007-Cleanup-PATH-and-shrpenv.patch +++ b/patches/0007-Cleanup-PATH-and-shrpenv.patch @@ -1,7 +1,7 @@ From 02338db33c0c284fd61bf417948efdd788de6588 Mon Sep 17 00:00:00 2001 From: Vladimir Smirnov Date: Mon, 19 May 2014 19:54:51 +0400 -Subject: [PATCH 07/29] Cleanup PATH and shrpenv +Subject: [PATCH 07/30] Cleanup PATH and shrpenv cut the crap of inventing paths, or adding search paths that we don't use diff --git a/patches/0008-Tweak-enc2xs-to-follow-symlinks-and-ignore-missing-I.patch b/patches/0008-Tweak-enc2xs-to-follow-symlinks-and-ignore-missing-I.patch index 31494ad..d1b5221 100644 --- a/patches/0008-Tweak-enc2xs-to-follow-symlinks-and-ignore-missing-I.patch +++ b/patches/0008-Tweak-enc2xs-to-follow-symlinks-and-ignore-missing-I.patch @@ -1,7 +1,7 @@ From cfd499f78fd79c4cb292935d557a91d48fbc99a5 Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Tue, 8 Mar 2005 19:30:38 +1100 -Subject: [PATCH 08/29] Tweak enc2xs to follow symlinks and ignore missing @INC +Subject: [PATCH 08/30] Tweak enc2xs to follow symlinks and ignore missing @INC directories. Bug-Debian: http://bugs.debian.org/290336 diff --git a/patches/0009-darwin-Use-CC-to-link.patch b/patches/0009-darwin-Use-CC-to-link.patch index 3a53419..fcd9f33 100644 --- a/patches/0009-darwin-Use-CC-to-link.patch +++ b/patches/0009-darwin-Use-CC-to-link.patch @@ -1,7 +1,7 @@ From ea285878e45eb49fdc0e24f898ed0671129a4e96 Mon Sep 17 00:00:00 2001 From: Vladimir Smirnov Date: Mon, 19 May 2014 19:59:52 +0400 -Subject: [PATCH 09/29] darwin: Use $CC to link +Subject: [PATCH 09/30] darwin: Use $CC to link Use $CC to link (and check for broken compilers), such that we don't get linked modules of a different bitness. diff --git a/patches/0010-Provide-a-sensible-INSTALLDIRS-default-for-modules-i.patch b/patches/0010-Provide-a-sensible-INSTALLDIRS-default-for-modules-i.patch index 41a9389..7f6cf8e 100644 --- a/patches/0010-Provide-a-sensible-INSTALLDIRS-default-for-modules-i.patch +++ b/patches/0010-Provide-a-sensible-INSTALLDIRS-default-for-modules-i.patch @@ -1,7 +1,7 @@ From d3c2bf81faa3c9ca7f410c891de203e52c7e3390 Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sat, 14 Apr 2012 13:34:20 +0200 -Subject: [PATCH 10/29] Provide a sensible INSTALLDIRS default for modules +Subject: [PATCH 10/30] Provide a sensible INSTALLDIRS default for modules installed from CPAN. Some modules which are included in core set INSTALLDIRS => 'perl' diff --git a/patches/0011-Fix-interix-hints.patch b/patches/0011-Fix-interix-hints.patch index a3fd1a1..dc64b8b 100644 --- a/patches/0011-Fix-interix-hints.patch +++ b/patches/0011-Fix-interix-hints.patch @@ -1,7 +1,7 @@ From 7fde95ad18572a2100e474242e342f7e56443f54 Mon Sep 17 00:00:00 2001 From: Vladimir Smirnov Date: Mon, 19 May 2014 20:01:41 +0400 -Subject: [PATCH 11/29] Fix interix hints +Subject: [PATCH 11/30] Fix interix hints Patch-Name: gentoo/interix.diff diff --git a/patches/0012-Set-libperl-soname.patch b/patches/0012-Set-libperl-soname.patch index 292c46b..07fe3c7 100644 --- a/patches/0012-Set-libperl-soname.patch +++ b/patches/0012-Set-libperl-soname.patch @@ -1,7 +1,7 @@ From 0e022e4750517a47c34f64d78524a6eb84d708a6 Mon Sep 17 00:00:00 2001 From: Vladimir Smirnov Date: Mon, 19 May 2014 19:41:49 +0400 -Subject: [PATCH 12/29] Set libperl soname +Subject: [PATCH 12/30] Set libperl soname Bug-Gentoo: https://bugs.gentoo.org/286840 diff --git a/patches/0013-Add-etc-perl-to-INC.patch b/patches/0013-Add-etc-perl-to-INC.patch index 1d086a5..80a8f66 100644 --- a/patches/0013-Add-etc-perl-to-INC.patch +++ b/patches/0013-Add-etc-perl-to-INC.patch @@ -1,7 +1,7 @@ From 44e7c6984fe301b9d4190420a25d9c1ad9aba12c Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sat, 14 Apr 2012 13:59:56 +0200 -Subject: [PATCH 13/29] Add /etc/perl to @INC +Subject: [PATCH 13/30] Add /etc/perl to @INC Patch-Name: gentoo/mod_paths.diff --- diff --git a/patches/0014-cpan-ExtUtils-MakeMaker-remove-targets-that-generate.patch b/patches/0014-cpan-ExtUtils-MakeMaker-remove-targets-that-generate.patch index 1419af6..8f8dac8 100644 --- a/patches/0014-cpan-ExtUtils-MakeMaker-remove-targets-that-generate.patch +++ b/patches/0014-cpan-ExtUtils-MakeMaker-remove-targets-that-generate.patch @@ -1,7 +1,7 @@ From f50381c37afd4de051b92b4de90e9fa2736c2cef Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Sun, 22 Jan 2017 18:58:49 +1300 -Subject: [PATCH 14/29] cpan/ExtUtils-MakeMaker: remove targets that generate +Subject: [PATCH 14/30] cpan/ExtUtils-MakeMaker: remove targets that generate perllocal.pod --- diff --git a/patches/0015-Don-t-force-fstack-protector-on-everyone.patch b/patches/0015-Don-t-force-fstack-protector-on-everyone.patch index e196b29..7e336db 100644 --- a/patches/0015-Don-t-force-fstack-protector-on-everyone.patch +++ b/patches/0015-Don-t-force-fstack-protector-on-everyone.patch @@ -1,7 +1,7 @@ From 7c7dbffce4750be3c5976497a72dfb9c4e1fb0f0 Mon Sep 17 00:00:00 2001 From: Vladimir Smirnov Date: Mon, 19 May 2014 19:44:44 +0400 -Subject: [PATCH 15/29] Don't force -fstack-protector on everyone +Subject: [PATCH 15/30] Don't force -fstack-protector on everyone Bug-Gentoo: https://bugs.gentoo.org/348557 diff --git a/patches/0016-Do-not-set-custom-CFLAGS-in-cpan-Digest-SHA.patch b/patches/0016-Do-not-set-custom-CFLAGS-in-cpan-Digest-SHA.patch index 9341457..dca83f3 100644 --- a/patches/0016-Do-not-set-custom-CFLAGS-in-cpan-Digest-SHA.patch +++ b/patches/0016-Do-not-set-custom-CFLAGS-in-cpan-Digest-SHA.patch @@ -1,7 +1,7 @@ From fab20bde4fdd9055b82ed95f7e35678be1946e8b Mon Sep 17 00:00:00 2001 From: Vladimir Smirnov Date: Mon, 15 Jun 2015 22:15:59 +0200 -Subject: [PATCH 16/29] Do not set custom CFLAGS in cpan/Digest-SHA +Subject: [PATCH 16/30] Do not set custom CFLAGS in cpan/Digest-SHA Bug-Gentoo: https://bugs.gentoo.org/506818 diff --git a/patches/0017-Configure-Don-t-include-sources-in-usr-local-for-com.patch b/patches/0017-Configure-Don-t-include-sources-in-usr-local-for-com.patch index 0cb8501..06c4273 100644 --- a/patches/0017-Configure-Don-t-include-sources-in-usr-local-for-com.patch +++ b/patches/0017-Configure-Don-t-include-sources-in-usr-local-for-com.patch @@ -1,7 +1,7 @@ From 1801a5752023243a233df7325cbd48319c56c1be Mon Sep 17 00:00:00 2001 From: Torsten Veller Date: Sun, 22 Jan 2017 19:02:24 +1300 -Subject: [PATCH 17/29] Configure: Don't include sources in /usr/local/ for +Subject: [PATCH 17/30] Configure: Don't include sources in /usr/local/ for compiling perl --- diff --git a/patches/0018-cpan-IO-Socket-IP-Disable-network-tests.patch b/patches/0018-cpan-IO-Socket-IP-Disable-network-tests.patch index 5bb166a..f38f18e 100644 --- a/patches/0018-cpan-IO-Socket-IP-Disable-network-tests.patch +++ b/patches/0018-cpan-IO-Socket-IP-Disable-network-tests.patch @@ -1,7 +1,7 @@ From 0ba203ef8d5d008bb096e7d46f0fb64d284d8e82 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Sun, 22 Jan 2017 19:08:53 +1300 -Subject: [PATCH 18/29] cpan/IO-Socket-IP: Disable network tests +Subject: [PATCH 18/30] cpan/IO-Socket-IP: Disable network tests --- cpan/IO-Socket-IP/t/15io-socket.t | 5 +++++ diff --git a/patches/0019-Fix-EUMM-podlocal-tests.patch b/patches/0019-Fix-EUMM-podlocal-tests.patch index bed9abb..9cd81dd 100644 --- a/patches/0019-Fix-EUMM-podlocal-tests.patch +++ b/patches/0019-Fix-EUMM-podlocal-tests.patch @@ -1,7 +1,7 @@ From 8dc6d8caf8198a4c9b71997ca6f8b3116486b945 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Sun, 22 Jan 2017 20:45:08 +1300 -Subject: [PATCH 19/29] Fix EUMM podlocal tests +Subject: [PATCH 19/30] Fix EUMM podlocal tests --- cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t | 3 +-- diff --git a/patches/0020-Skip-auto-linking-nsl-and-cl.patch b/patches/0020-Skip-auto-linking-nsl-and-cl.patch index 7572d79..1e22947 100644 --- a/patches/0020-Skip-auto-linking-nsl-and-cl.patch +++ b/patches/0020-Skip-auto-linking-nsl-and-cl.patch @@ -1,7 +1,7 @@ From 71f6c272e638b217154d250000a0b5b8afebfc5a Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Thu, 25 Jun 2020 21:18:50 +1200 -Subject: [PATCH 20/29] Skip auto-linking nsl and cl +Subject: [PATCH 20/30] Skip auto-linking nsl and cl Bug: https://rt.perl.org/Public/Bug/Display.html?id=13148 --- diff --git a/patches/0021-Disable-porting-tests-which-create-fun-false-failure.patch b/patches/0021-Disable-porting-tests-which-create-fun-false-failure.patch index 0f733f9..a94861d 100644 --- a/patches/0021-Disable-porting-tests-which-create-fun-false-failure.patch +++ b/patches/0021-Disable-porting-tests-which-create-fun-false-failure.patch @@ -1,7 +1,7 @@ From 4f19b76c72b0481c4d1225ac2eb469977c59d5ac Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Sun, 8 Jul 2018 16:06:05 +1200 -Subject: [PATCH 21/29] Disable porting tests which create fun false-failures +Subject: [PATCH 21/30] Disable porting tests which create fun false-failures all over travis This is due to our patches tweaking code in-band, and this test diff --git a/patches/0022-Disable-PathTools-tests-which-fails-under-sandboxing.patch b/patches/0022-Disable-PathTools-tests-which-fails-under-sandboxing.patch index b6560de..f0cdf59 100644 --- a/patches/0022-Disable-PathTools-tests-which-fails-under-sandboxing.patch +++ b/patches/0022-Disable-PathTools-tests-which-fails-under-sandboxing.patch @@ -1,7 +1,7 @@ From a31a9b9a82e329b0dc9e89dfd3a65a8012500813 Mon Sep 17 00:00:00 2001 From: Kent Fredric Date: Sun, 8 Jul 2018 15:09:29 +1200 -Subject: [PATCH 22/29] Disable PathTools tests which fails under sandboxing +Subject: [PATCH 22/30] Disable PathTools tests which fails under sandboxing Bug: https://bugs.gentoo.org/645084 --- diff --git a/patches/0023-Fix-CPAN-FirstTime-defaults-with-nonexisting-site-di.patch b/patches/0023-Fix-CPAN-FirstTime-defaults-with-nonexisting-site-di.patch index f6a5642..e133c19 100644 --- a/patches/0023-Fix-CPAN-FirstTime-defaults-with-nonexisting-site-di.patch +++ b/patches/0023-Fix-CPAN-FirstTime-defaults-with-nonexisting-site-di.patch @@ -1,7 +1,7 @@ From 137063eec716960fa6d46249677121161353b0d6 Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Tue, 16 Oct 2012 23:07:56 +0300 -Subject: [PATCH 23/29] Fix CPAN::FirstTime defaults with nonexisting site dirs +Subject: [PATCH 23/30] Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent is writable The site directories do not exist on a typical Debian system. The build diff --git a/patches/0024-Pass-LD-settings-through-to-subdirectories.patch b/patches/0024-Pass-LD-settings-through-to-subdirectories.patch index 500a535..4c344b4 100644 --- a/patches/0024-Pass-LD-settings-through-to-subdirectories.patch +++ b/patches/0024-Pass-LD-settings-through-to-subdirectories.patch @@ -1,7 +1,7 @@ From 7854f7b94db2ad8890fa074a196e79bd3e5cc5e6 Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Sun, 24 Aug 2014 12:56:11 -0700 -Subject: [PATCH 24/29] Pass LD settings through to subdirectories +Subject: [PATCH 24/30] Pass LD settings through to subdirectories [rt.cpan.org #28632] fixed most issues with passing LD down to subdirectory Makefile.PL files. However, there are some distributions diff --git a/patches/0025-Memoize-Storable-respect-nstore-option-not-respected.patch b/patches/0025-Memoize-Storable-respect-nstore-option-not-respected.patch index bbb7f96..b881284 100644 --- a/patches/0025-Memoize-Storable-respect-nstore-option-not-respected.patch +++ b/patches/0025-Memoize-Storable-respect-nstore-option-not-respected.patch @@ -1,7 +1,7 @@ From 1bc4d514dd27afd00e0c3522e4c3c794a5dbf525 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 27 Jul 2012 10:35:07 -0500 -Subject: [PATCH 25/29] Memoize::Storable: respect 'nstore' option not +Subject: [PATCH 25/30] Memoize::Storable: respect 'nstore' option not respected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/patches/0026-Better-errors-for-man-pages-from-standard-input.patch b/patches/0026-Better-errors-for-man-pages-from-standard-input.patch index 6c17cc6..24fdb91 100644 --- a/patches/0026-Better-errors-for-man-pages-from-standard-input.patch +++ b/patches/0026-Better-errors-for-man-pages-from-standard-input.patch @@ -1,7 +1,7 @@ From f440bb9da0ef35176435103d392316e03769c980 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sat, 7 Feb 2015 19:03:34 -0800 -Subject: [PATCH 26/29] Better errors for man pages from standard input +Subject: [PATCH 26/30] Better errors for man pages from standard input [Pod::Man] Attempt to detect if the input came from a pipe and therefore has a completely unhelpful (and nonreproducible) source file diff --git a/patches/0027-Respect-umask-during-installation.patch b/patches/0027-Respect-umask-during-installation.patch index b6a6183..da9f554 100644 --- a/patches/0027-Respect-umask-during-installation.patch +++ b/patches/0027-Respect-umask-during-installation.patch @@ -1,7 +1,7 @@ From 956a8bab66adec923b44ad28a68f3188d7bafaa6 Mon Sep 17 00:00:00 2001 From: Brendan O'Dea Date: Tue, 8 Mar 2005 19:30:38 +1100 -Subject: [PATCH 27/29] Respect umask during installation +Subject: [PATCH 27/30] Respect umask during installation This is needed to satisfy Debian policy regarding group-writable site directories. diff --git a/patches/0028-Document-that-CCFLAGS-should-include-Config-ccflags.patch b/patches/0028-Document-that-CCFLAGS-should-include-Config-ccflags.patch index 4b8606a..1f93764 100644 --- a/patches/0028-Document-that-CCFLAGS-should-include-Config-ccflags.patch +++ b/patches/0028-Document-that-CCFLAGS-should-include-Config-ccflags.patch @@ -1,7 +1,7 @@ From 5c18e36f56ad44d59ba964fbafbbf76f352456eb Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Mon, 30 May 2011 22:54:24 +0300 -Subject: [PATCH 28/29] Document that CCFLAGS should include $Config{ccflags} +Subject: [PATCH 28/30] Document that CCFLAGS should include $Config{ccflags} Bug: https://rt.cpan.org/Public/Bug/Display.html?id=68613 Bug-Debian: http://bugs.debian.org/628522 diff --git a/patches/0029-Fix-parallel-building.patch b/patches/0029-Fix-parallel-building.patch index 39d2559..c35fbbb 100644 --- a/patches/0029-Fix-parallel-building.patch +++ b/patches/0029-Fix-parallel-building.patch @@ -1,7 +1,7 @@ From 8f4e4d8bf89b37b9c5c4d839dbff8720ea11c479 Mon Sep 17 00:00:00 2001 From: Tom Hukins Date: Thu, 8 Sep 2016 16:01:36 +0000 -Subject: [PATCH 29/29] Fix parallel building +Subject: [PATCH 29/30] Fix parallel building Commit 3dfcef7e97bf1b516f added a dependency on Porting/pod_lib.pl to Porting/manisort. Porting/pod_lib.pl depends on File::Find which in diff --git a/patches/0030-Add-support-for-Dgentoolibdirs.patch b/patches/0030-Add-support-for-Dgentoolibdirs.patch new file mode 100644 index 0000000..63e4bbb --- /dev/null +++ b/patches/0030-Add-support-for-Dgentoolibdirs.patch @@ -0,0 +1,400 @@ +From 6a1adc5393ecbcfad28d0562ca5efb4774f9a0d8 Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Sat, 20 Jun 2020 22:14:22 +1200 +Subject: [PATCH 30/30] Add support for -Dgentoolibdirs + +Which just adds the libdirs verbatim in the right place without +having perl molest it in the process. +--- + Configure | 26 ++++++++++++++++++++++++++ + Cross/config.sh-arm-linux | 2 ++ + Cross/config.sh-arm-linux-n770 | 2 ++ + NetWare/config.wc | 2 ++ + Porting/config.sh | 2 ++ + config_h.SH | 5 +++++ + configure.com | 2 ++ + perl.c | 1 + + perl_inc_macro.h | 8 ++++++++ + plan9/config_sh.sample | 2 ++ + symbian/config.sh | 2 ++ + uconfig.h | 9 +++++++-- + uconfig.sh | 2 ++ + uconfig64.sh | 2 ++ + win32/config.ce | 2 ++ + win32/config.gc | 2 ++ + win32/config.vc | 2 ++ + 17 files changed, 71 insertions(+), 2 deletions(-) + +diff --git a/Configure b/Configure +index ce74277f85..98702eca89 100755 +--- a/Configure ++++ b/Configure +@@ -1155,6 +1155,8 @@ orderlib='' + ranlib='' + d_perl_otherlibdirs='' + otherlibdirs='' ++gentoolibdirs='' ++d_gentoolibdirs='' + package='' + spackage='' + pager='' +@@ -8037,6 +8039,28 @@ esac + set d_perl_otherlibdirs + eval $setvar + ++case "$gentoolibdirs" in ++''|' ') dflt='none' ;; ++*) dflt="$gentoolibdirs" ;; ++esac ++$cat <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un + */ + #$d_perl_otherlibdirs PERL_OTHERLIBDIRS "$otherlibdirs" /**/ + ++/* GENTOO_LIBDIRS: ++ * Like PERL_OTHERLIBDIRS, but doesn't stuff ARCH dirs in when not wanted ++ */ ++#$d_gentoolibdirs GENTOO_LIBDIRS "$gentoolibdirs" /**/ ++ + /* PRIVLIB: + * This symbol contains the name of the private library for this package. + * The library is private in the sense that it needn't be in anyone's +diff --git a/configure.com b/configure.com +index 1f3e73c681..14f3cb33fa 100644 +--- a/configure.com ++++ b/configure.com +@@ -6498,6 +6498,7 @@ $ WC "full_ar='" + "'" + $ WC "full_csh='" + " '" + $ WC "full_sed='_NLA0:'" + $ WC "gccversion='" + gccversion + "'" ++$ WC "gentoolibdirs='" + "'" + $ WC "gidformat='lu'" + $ WC "gidsign='1'" + $ WC "gidsize='4'" +@@ -6895,6 +6896,7 @@ $ WC "d_endpwent_r='undef'" + $ WC "d_endservent_r='undef'" + $ WC "d_freelocale='undef'" + $ WC "d_gai_strerror='define'" ++$ WC "d_gentoolibdirs='undef'" + $ WC "d_getgrent_r='undef'" + $ WC "d_getgrgid_r='" + d_getgrgid_r + "'" + $ WC "d_getgrnam_r='" + d_getgrnam_r + "'" +diff --git a/perl.c b/perl.c +index 14cdaac1b1..4a989adbd8 100644 +--- a/perl.c ++++ b/perl.c +@@ -4710,6 +4710,7 @@ S_init_perllib(pTHX) + INCPUSH_ARCHLIB_EXP + INCPUSH_PRIVLIB_EXP + INCPUSH_PERL_OTHERLIBDIRS ++ INCPUSH_GENTOO_LIBDIRS + INCPUSH_PERL5LIB + INCPUSH_APPLLIB_OLD_EXP + INCPUSH_PERL_OTHERLIBDIRS_ARCHONLY +diff --git a/perl_inc_macro.h b/perl_inc_macro.h +index 5a2f20dfae..4b69b39199 100644 +--- a/perl_inc_macro.h ++++ b/perl_inc_macro.h +@@ -143,6 +143,14 @@ + INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); + #endif + ++#ifdef GENTOO_LIBDIRS ++# define INCPUSH_GENTOO_LIBDIRS S_incpush_use_sep(aTHX_ STR_WITH_LEN(GENTOO_LIBDIRS), \ ++ INCPUSH_ADD_OLD_VERS|INCPUSH_CAN_RELOCATE); ++#endif ++#ifndef INCPUSH_GENTOO_LIBDIRS ++# define INCPUSH_GENTOO_LIBDIRS ++#endif ++ + #ifdef PERL_OTHERLIBDIRS + # define INCPUSH_PERL_OTHERLIBDIRS_ARCHONLY S_incpush_use_sep(aTHX_ STR_WITH_LEN(PERL_OTHERLIBDIRS), \ + INCPUSH_ADD_OLD_VERS|INCPUSH_ADD_ARCHONLY_SUB_DIRS|INCPUSH_CAN_RELOCATE); +diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample +index 4eda90ffa7..774ede15a7 100644 +--- a/plan9/config_sh.sample ++++ b/plan9/config_sh.sample +@@ -245,6 +245,7 @@ d_futimes='undef' + d_gai_strerror='undef' + d_gdbm_ndbm_h_uses_prototypes='undef' + d_gdbmndbm_h_uses_prototypes='undef' ++d_gentoolibdirs='undef' + d_getaddrinfo='undef' + d_getcwd='define' + d_getespwnam='undef' +@@ -683,6 +684,7 @@ full_csh='csh' + full_sed='/bin/sed' + gccosandvers='' + gccversion='' ++gentoolibdirs='' + getgrent_r_proto='0' + getgrgid_r_proto='0' + getgrnam_r_proto='0' +diff --git a/symbian/config.sh b/symbian/config.sh +index 8b3122b286..16892609e7 100644 +--- a/symbian/config.sh ++++ b/symbian/config.sh +@@ -191,6 +191,7 @@ d_futimesat='undef' + d_gai_strerror='undef' + d_gdbm_ndbm_h_uses_prototypes='undef' + d_gdbmndbm_h_uses_prototypes='undef' ++d_gentoolibdirs='undef' + d_getaddrinfo='undef' + d_getcwd='define' + d_getespwnam='undef' +@@ -619,6 +620,7 @@ freetype=void + full_ar=':' + full_csh=':' + full_sed=':' ++gentoolibdirs='' + getgrent_r_proto='0' + getgrgid_r_proto='0' + getgrnam_r_proto='0' +diff --git a/uconfig.h b/uconfig.h +index 9341deef18..9e8104b8dc 100644 +--- a/uconfig.h ++++ b/uconfig.h +@@ -1273,6 +1273,11 @@ + */ + /*#define PERL_OTHERLIBDIRS " " / **/ + ++/* GENTOO_LIBDIRS: ++ * Like PERL_OTHERLIBDIRS, but doesn't stuff ARCH dirs in when not wanted ++ */ ++/*#define GENTOO_LIBDIRS "" / **/ ++ + /* PRIVLIB: + * This symbol contains the name of the private library for this package. + * The library is private in the sense that it needn't be in anyone's +@@ -5244,6 +5249,6 @@ + #endif + + /* Generated from: +- * 6608de918c3c876975f74b684da2536ab1ee23459783d691ae02ce2526a497a7 config_h.SH +- * 2aaf18b9277e180fc5e5d60290ecb0c91fcac3531bd8825e5687a212daa586e9 uconfig.sh ++ * 71d489549fbc34d51f8607773f4f148a56d87b1140a2d9455a5502385b11372b config_h.SH ++ * 1ad687ed5ef0d02db55efe7f54c7b298d4e98f48a3c5c8bdb60a916500832cdf uconfig.sh + * ex: set ro: */ +diff --git a/uconfig.sh b/uconfig.sh +index 560a766e75..205b66b5f7 100644 +--- a/uconfig.sh ++++ b/uconfig.sh +@@ -184,6 +184,7 @@ d_futimes='undef' + d_gai_strerror='undef' + d_gdbm_ndbm_h_uses_prototypes='undef' + d_gdbmndbm_h_uses_prototypes='undef' ++d_gentoolibdirs='undef' + d_getaddrinfo='undef' + d_getcwd='undef' + d_getespwnam='undef' +@@ -605,6 +606,7 @@ fpostype=int + freetype=void + full_csh='' + full_sed='' ++gentoolibdirs='' + getgrent_r_proto='0' + getgrgid_r_proto='0' + getgrnam_r_proto='0' +diff --git a/uconfig64.sh b/uconfig64.sh +index bab459fdbf..683b85b6f2 100644 +--- a/uconfig64.sh ++++ b/uconfig64.sh +@@ -184,6 +184,7 @@ d_futimes='undef' + d_gai_strerror='undef' + d_gdbm_ndbm_h_uses_prototypes='undef' + d_gdbmndbm_h_uses_prototypes='undef' ++d_gentoolibdirs='undef' + d_getaddrinfo='undef' + d_getcwd='undef' + d_getespwnam='undef' +@@ -605,6 +606,7 @@ fpostype=int + freetype=void + full_csh='' + full_sed='' ++gentoolibdirs='' + getgrent_r_proto='0' + getgrgid_r_proto='0' + getgrnam_r_proto='0' +diff --git a/win32/config.ce b/win32/config.ce +index 2f2d67c231..055ff4d671 100644 +--- a/win32/config.ce ++++ b/win32/config.ce +@@ -231,6 +231,7 @@ d_futimes='undef' + d_gai_strerror='undef' + d_gdbm_ndbm_h_uses_prototypes='undef' + d_gdbmndbm_h_uses_prototypes='undef' ++d_gentoolibdirs='undef' + d_getaddrinfo='undef' + d_getcwd='define' + d_getespwnam='undef' +@@ -669,6 +670,7 @@ full_ar='' + full_csh='' + full_sed='' + gccversion='' ++gentoolibdirs='' + getgrent_r_proto='0' + getgrgid_r_proto='0' + getgrnam_r_proto='0' +diff --git a/win32/config.gc b/win32/config.gc +index ce9a6b9ad7..51872e2938 100644 +--- a/win32/config.gc ++++ b/win32/config.gc +@@ -232,6 +232,7 @@ d_futimes='undef' + d_gai_strerror='undef' + d_gdbm_ndbm_h_uses_prototypes='undef' + d_gdbmndbm_h_uses_prototypes='undef' ++d_gentoolibdirs='undef' + d_getaddrinfo='undef' + d_getcwd='define' + d_getespwnam='undef' +@@ -676,6 +677,7 @@ full_sed='' + gccansipedantic='' + gccosandvers='' + gccversion='' ++gentoolibdirs='' + getgrent_r_proto='0' + getgrgid_r_proto='0' + getgrnam_r_proto='0' +diff --git a/win32/config.vc b/win32/config.vc +index 0855dc8c09..a6f5ffc2bd 100644 +--- a/win32/config.vc ++++ b/win32/config.vc +@@ -232,6 +232,7 @@ d_futimes='undef' + d_gai_strerror='undef' + d_gdbm_ndbm_h_uses_prototypes='undef' + d_gdbmndbm_h_uses_prototypes='undef' ++d_gentoolibdirs='undef' + d_getaddrinfo='undef' + d_getcwd='define' + d_getespwnam='undef' +@@ -675,6 +676,7 @@ full_sed='' + gccansipedantic='' + gccosandvers='' + gccversion='' ++gentoolibdirs='' + getgrent_r_proto='0' + getgrgid_r_proto='0' + getgrnam_r_proto='0' +-- +2.27.0 +