From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 61/62] perl: Fix build in toolchain stage Date: Sun, 16 Aug 2020 10:29:52 +0000 Message-ID: <20200816102953.3881-61-michael.tremer@ipfire.org> In-Reply-To: <20200816102953.3881-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5709703429909973399==" List-Id: --===============5709703429909973399== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable perl searches for headers and libraries in the wrong paths and detects GCC 10 as GCC 1.x. Signed-off-by: Michael Tremer --- lfs/perl | 6 +- ...0.0-fix-build-failure-against-gcc-10.patch | 99 +++++++++++++++++++ 2 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.= patch diff --git a/lfs/perl b/lfs/perl index 690d5df29..bc0d67d5f 100644 --- a/lfs/perl +++ b/lfs/perl @@ -80,15 +80,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -i -e 's|-fstack-protector|-fno-stack-protector|g' Con= figure + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/perl-5.30.0-fix-build-= failure-against-gcc-10.patch ifeq "$(ROOT)" "" cd $(DIR_APP) && ./configure.gnu --prefix=3D/usr -Dman1dir=3D/usr/share/man= /man1 \ -Dman3dir=3D/usr/share/man/man3 -Dpager=3D"/usr/bin/less -isR" -Dusethreads cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install else - cd $(DIR_APP) && ./Configure -des -Dprefix=3D$(TOOLS_DIR) - cd $(DIR_APP) && make + cd $(DIR_APP) && ./Configure -des -Dprefix=3D$(TOOLS_DIR) -Dlibs=3D"-lpthre= ad -lm" -Uloclibpth -Ulocincpth + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && cp -v perl cpan/podlators/scripts/pod2man $(TOOLS_DIR)/bin cd $(DIR_APP) && mkdir -pv $(TOOLS_DIR)/lib/perl5/$(VER) cd $(DIR_APP) && cp -Rv lib/* $(TOOLS_DIR)/lib/perl5/$(VER) diff --git a/src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.patch b= /src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.patch new file mode 100644 index 000000000..bb9252785 --- /dev/null +++ b/src/patches/perl-5.30.0-fix-build-failure-against-gcc-10.patch @@ -0,0 +1,99 @@ +https://bugs.gentoo.org/708744 + +From 6bd6308fcea3541e505651bf8e8127a4a03d22cd Mon Sep 17 00:00:00 2001 +From: =3D?UTF-8?q?Petr=3D20P=3DC3=3DADsa=3DC5=3D99?=3D +Date: Tue, 12 Nov 2019 09:19:18 +0100 +Subject: [PATCH] Adapt Configure to GCC version 10 + +I got a notice from Jeff Law : + + 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=3D`./loc gcc-cpp $cpp $pth` ;; ++1.*) cpp=3D`./loc gcc-cpp $cpp $pth` ;; + esac + case "$gccversion" in + '') gccosandvers=3D'' ;; +@@ -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=3D`$cc $ccflags -I$incdir -c try.c 2>&1 | \ +@@ -5467,13 +5467,13 @@ fi + case "$hint" in + default|recommended) + case "$gccversion" in +- 1*) dflt=3D"$dflt -fpcc-struct-return" ;; ++ 1.*) dflt=3D"$dflt -fpcc-struct-return" ;; + esac + case "$optimize:$DEBUGGING" in + *-g*:old) dflt=3D"$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=3D"$cppflags -D__GNUC__" ++1.*) cppflags=3D"$cppflags -D__GNUC__" + esac + case "$mips_type" in + '');; +@@ -23103,7 +23103,7 @@ fi +=20 + : 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=3D*) # 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 +=20 + 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=3Dc89 without -pedantic is a bit pointless. +--=20 +2.25.0 + --=20 2.20.1 --===============5709703429909973399==--