diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-lang/perl/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-lang/perl/files')
-rw-r--r-- | dev-lang/perl/files/perl-5.30.1-gcc-10.patch | 99 | ||||
-rw-r--r-- | dev-lang/perl/files/perl-5.30.3-gentoo-libdirs.patch | 135 |
2 files changed, 0 insertions, 234 deletions
diff --git a/dev-lang/perl/files/perl-5.30.1-gcc-10.patch b/dev-lang/perl/files/perl-5.30.1-gcc-10.patch deleted file mode 100644 index bb92527853f5..000000000000 --- a/dev-lang/perl/files/perl-5.30.1-gcc-10.patch +++ /dev/null @@ -1,99 +0,0 @@ -https://bugs.gentoo.org/708744 - -From 6bd6308fcea3541e505651bf8e8127a4a03d22cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> -Date: Tue, 12 Nov 2019 09:19:18 +0100 -Subject: [PATCH] Adapt Configure to GCC version 10 - -I got a notice from Jeff Law <law@redhat.com>: - - Your particular package fails its testsuite. This was ultimately - tracked down to a Configure problem. The perl configure script treated - gcc-10 as gcc-1 and turned on -fpcc-struct-return. This is an ABI - changing flag and caused Perl to not be able to interact properly with - the dbm libraries on the system leading to a segfault. - -His proposed patch corrected only this one instance of the version -mismatch. Reading the Configure script revealed more issues. This -patch fixes all of them I found. - -Please note I do not have GCC 10 available, I tested it by faking the version -with: - ---- a/Configure -+++ b/Configure -@@ -4701,7 +4701,7 @@ else - fi - $rm -f try try.* - case "$gccversion" in --1*) cpp=`./loc gcc-cpp $cpp $pth` ;; -+1.*) cpp=`./loc gcc-cpp $cpp $pth` ;; - esac - case "$gccversion" in - '') gccosandvers='' ;; -@@ -4741,7 +4741,7 @@ esac - # gcc 3.* complain about adding -Idirectories that they already know about, - # so we will take those off from locincpth. - case "$gccversion" in --3*) -+3.*) - echo "main(){}">try.c - for incdir in $locincpth; do - warn=`$cc $ccflags -I$incdir -c try.c 2>&1 | \ -@@ -5467,13 +5467,13 @@ fi - case "$hint" in - default|recommended) - case "$gccversion" in -- 1*) dflt="$dflt -fpcc-struct-return" ;; -+ 1.*) dflt="$dflt -fpcc-struct-return" ;; - esac - case "$optimize:$DEBUGGING" in - *-g*:old) dflt="$dflt -DDEBUGGING";; - esac - case "$gccversion" in -- 2*) if $test -d /etc/conf/kconfig.d && -+ 2.*) if $test -d /etc/conf/kconfig.d && - $contains _POSIX_VERSION $usrinc/sys/unistd.h >/dev/null 2>&1 - then - # Interactive Systems (ISC) POSIX mode. -@@ -5482,7 +5482,7 @@ default|recommended) - ;; - esac - case "$gccversion" in -- 1*) ;; -+ 1.*) ;; - 2.[0-8]*) ;; - ?*) set strict-aliasing -fno-strict-aliasing - eval $checkccflag -@@ -5600,7 +5600,7 @@ case "$cppflags" in - ;; - esac - case "$gccversion" in --1*) cppflags="$cppflags -D__GNUC__" -+1.*) cppflags="$cppflags -D__GNUC__" - esac - case "$mips_type" in - '');; -@@ -23103,7 +23103,7 @@ fi - - : add -D_FORTIFY_SOURCE if feasible and not already there - case "$gccversion" in --[456789].*) case "$optimize$ccflags" in -+[456789].*|[1-9][0-9]*) case "$optimize$ccflags" in - *-O*) case "$ccflags$cppsymbols" in - *_FORTIFY_SOURCE=*) # Don't add it again. - echo "You seem to have -D_FORTIFY_SOURCE already, not adding it." >&4 ---- a/cflags.SH -+++ b/cflags.SH -@@ -156,7 +156,7 @@ esac - - case "$gccversion" in - '') ;; --[12]*) ;; # gcc versions 1 (gasp!) and 2 are not good for this. -+[12].*) ;; # gcc versions 1 (gasp!) and 2 are not good for this. - Intel*) ;; # # Is that you, Intel C++? - # - # NOTE 1: the -std=c89 without -pedantic is a bit pointless. --- -2.25.0 - diff --git a/dev-lang/perl/files/perl-5.30.3-gentoo-libdirs.patch b/dev-lang/perl/files/perl-5.30.3-gentoo-libdirs.patch deleted file mode 100644 index b9e36223a941..000000000000 --- a/dev-lang/perl/files/perl-5.30.3-gentoo-libdirs.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 7572be1afb16621a537e9da02f96cf04cb10b655 Mon Sep 17 00:00:00 2001 -From: Kent Fredric <kentnl@gentoo.org> -Date: Sat, 20 Jun 2020 22:14:22 +1200 -Subject: Add support for -Dgentoolibdirs - -Which just adds the libdirs verbatim in the right place without -having perl molest it in the process. ---- - Configure | 26 ++++++++++++++++++++++++++ - config_h.SH | 5 +++++ - perl.c | 1 + - perl_inc_macro.h | 8 ++++++++ - uconfig.sh | 1 + - 5 files changed, 41 insertions(+) - -diff --git a/Configure b/Configure -index cef8c3c078..77258e8f43 100755 ---- a/Configure -+++ b/Configure -@@ -1181,6 +1181,8 @@ orderlib='' - ranlib='' - d_perl_otherlibdirs='' - otherlibdirs='' -+gentoolibdirs='' -+d_gentoolibdirs='' - package='' - spackage='' - pager='' -@@ -8101,6 +8103,28 @@ esac - set d_perl_otherlibdirs - eval $setvar - -+case "$gentoolibdirs" in -+''|' ') dflt='none' ;; -+*) dflt="$gentoolibdirs" ;; -+esac -+$cat <<EOM -+Enter a colon-seperated list of explicit gentoo paths to stuff in @INC -+unmolested, or enter 'none' for no extra paths -+ -+EOM -+rp='Colon-seperated list of gentoo-specific perl library search dirs?' -+. ./myread -+case "$ans" in -+' '|''|none) gentoolibdirs=' ';; -+*) gentoolibdirs="$ans" ;; -+esac -+case "$gentoolibdirs" in -+' ') val=$undef ;; -+*) val=$define ;; -+esac -+set d_gentoolibdirs -+eval $setvar -+ - : DTrace support - dflt_dtrace='/usr/sbin/dtrace' - $test -x /usr/bin/dtrace && dflt_dtrace='/usr/bin/dtrace' -@@ -24402,6 +24426,7 @@ d_openat='$d_openat' - d_pathconf='$d_pathconf' - d_pause='$d_pause' - d_perl_otherlibdirs='$d_perl_otherlibdirs' -+d_gentoolibdirs='$d_gentoolibdirs' - d_phostname='$d_phostname' - d_pipe2='$d_pipe2' - d_pipe='$d_pipe' -@@ -24937,6 +24962,7 @@ orderlib='$orderlib' - osname='$osname' - osvers='$osvers' - otherlibdirs='$otherlibdirs' -+gentoolibdirs='$gentoolibdirs' - package='$package' - pager='$pager' - passcat='$passcat' -diff --git a/config_h.SH b/config_h.SH -index 08c5923ef8..5563082969 100755 ---- a/config_h.SH -+++ b/config_h.SH -@@ -1308,6 +1308,11 @@ sed <<!GROK!THIS! >$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/perl.c b/perl.c -index 2013a76026..62e67cfaa2 100644 ---- a/perl.c -+++ b/perl.c -@@ -4750,6 +4750,7 @@ S_init_perllib(pTHX) - INCPUSH_ARCHLIB_EXP - INCPUSH_PRIVLIB_EXP - INCPUSH_PERL_OTHERLIBDIRS -+ INCPUSH_GENTOO_LIBDIRS - INCPUSH_PERL5LIB - INCPUSH_APPLLIB_OLD_EXP - INCPUSH_SITELIB_STEM -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/uconfig.sh b/uconfig.sh -index 1d4a0f4a57..fba825acad 100644 ---- a/uconfig.sh -+++ b/uconfig.sh -@@ -185,6 +185,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' --- -2.27.0 - |