]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
perl: remove unused patches
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 16 Aug 2019 19:33:52 +0000 (21:33 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 16 Aug 2019 19:33:52 +0000 (21:33 +0200)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
src/patches/perl-5.12.3-libc-2.patch [deleted file]
src/patches/perl-Fix-Errno.pm-generation-for-gcc-5.0.patch [deleted file]

diff --git a/src/patches/perl-5.12.3-libc-2.patch b/src/patches/perl-5.12.3-libc-2.patch
deleted file mode 100644 (file)
index f31910b..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-Submitted By: Anderson Lizardo <andersonlizardo(at)yahoo(dot)com(dot)br>
-Date: 2006-02-15
-Initial Package Version: 5.8.8
-Origin: based on current LFS-BOOK patch (perl-5.8.0-libc-2.patch)
-Description: this patch adapts some hard-wired paths to the C library.
-             It uses the $prefix variable to locate the correct libc.
-
-diff -Naur perl-5.8.8.orig/hints/linux.sh perl-5.8.8/hints/linux.sh
---- perl-5.8.8.orig/hints/linux.sh     2005-11-18 01:18:45.000000000 +0000
-+++ perl-5.8.8/hints/linux.sh  2006-02-12 12:20:32.000000000 +0000
-@@ -52,9 +52,9 @@
- # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
- # are insufficiently precise to distinguish things like
- # libc-2.0.6 and libc-2.0.7.
--if test -L /lib/libc.so.6; then
--    libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
--    libc=/lib/$libc
-+if test -L ${prefix}/lib/libc.so.6; then
-+    libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'`
-+    libc=${prefix}/lib/$libc
- fi
- # Configure may fail to find lstat() since it's a static/inline
-@@ -330,3 +330,8 @@
-     libswanted="$*"
-     ;;
- esac
-+
-+locincpth=""
-+loclibpth=""
-+glibpth="${prefix}/lib"
-+usrinc="${prefix}/include"
diff --git a/src/patches/perl-Fix-Errno.pm-generation-for-gcc-5.0.patch b/src/patches/perl-Fix-Errno.pm-generation-for-gcc-5.0.patch
deleted file mode 100644 (file)
index 1f6e80a..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-From 96bcd6ed97ff05f5b421005f23973279dbfcafbf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Wed, 11 Feb 2015 15:46:37 +0100
-Subject: [PATCH 1/2] Fix Errno.pm generation for gcc-5.0
-
-gcc-5.0 -E interleaves now line numbers with expended macros, so that
-the generated errno.c will be preprocessed to
-
-EBFONT => [[
-           59
-                ]]
-
-which is hard to parse in in line-based reader.
-
-So use -P option with gcc >= 5.0. Global -P usage would break makedepend,
-global -ftrack-macro-expansion=0 would break lib/h2ph.t.
-
-RT#123784
----
- ext/Errno/Errno_pm.PL | 23 +++++++++++++++++------
- 1 file changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
-index 3dadfce..c6bfa06 100644
---- a/ext/Errno/Errno_pm.PL
-+++ b/ext/Errno/Errno_pm.PL
-@@ -215,20 +215,31 @@ sub write_errno_pm {
-     { # BeOS (support now removed) did not enter this block
-     # invoke CPP and read the output
-+      my $inhibit_linemarkers = '';
-+      if ($Config{gccversion} =~ /\A(\d+)\./ and $1 >= 5) {
-+          # GCC 5.0 interleaves expanded macros with line numbers breaking
-+          # each line into multiple lines. RT#123784
-+          $inhibit_linemarkers = ' -P';
-+      }
-+
-       if ($^O eq 'VMS') {
--          my $cpp = "$Config{cppstdin} $Config{cppflags} $Config{cppminus}";
-+          my $cpp = "$Config{cppstdin} $Config{cppflags}" .
-+              $inhibit_linemarkers . " $Config{cppminus}";
-           $cpp =~ s/sys\$input//i;
-           open(CPPO,"$cpp  errno.c |") or
-               die "Cannot exec $Config{cppstdin}";
-       } elsif ($IsMSWin32 || $^O eq 'NetWare') {
--          open(CPPO,"$Config{cpprun} $Config{cppflags} errno.c |") or
--              die "Cannot run '$Config{cpprun} $Config{cppflags} errno.c'";
-+          my $cpp = "$Config{cpprun} $Config{cppflags}" .
-+              $inhibit_linemarkers;
-+          open(CPPO,"$cpp errno.c |") or
-+              die "Cannot run '$cpp errno.c'";
-       } elsif ($IsSymbian) {
--            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc -";
-+            my $cpp = "gcc -E -I$ENV{SDK}\\epoc32\\include\\libc" .
-+              $inhibit_linemarkers ." -";
-           open(CPPO,"$cpp < errno.c |")
-               or die "Cannot exec $cpp";
-         } else {
--          my $cpp = default_cpp();
-+          my $cpp = default_cpp() . $inhibit_linemarkers;
-           open(CPPO,"$cpp < errno.c |")
-               or die "Cannot exec $cpp";
-       }
--- 
-2.3.0
-