diff -u gcc-4.9-4.9.4/debian/changelog gcc-4.9-4.9.4/debian/changelog --- gcc-4.9-4.9.4/debian/changelog +++ gcc-4.9-4.9.4/debian/changelog @@ -1,3 +1,12 @@ +gcc-4.9 (4.9.4-2+rpi1) buster-staging; urgency=medium + + * Replace realpath build-dependency with coreutils (>= 8.23-1~) + * Disable testsuite. + * Add patch from buildroot to fix asan build with newer glibc. + * Disable go. + + -- Peter Michael Green Thu, 08 Feb 2018 00:59:27 +0000 + gcc-4.9 (4.9.4-2) unstable; urgency=medium * Fix detection of newer ISL versions. diff -u gcc-4.9-4.9.4/debian/control gcc-4.9-4.9.4/debian/control --- gcc-4.9-4.9.4/debian/control +++ gcc-4.9-4.9.4/debian/control @@ -18,7 +18,7 @@ texinfo (>= 4.3), locales, sharutils, procps, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, netbase, libcloog-isl-dev (>= 0.18.3), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), - dejagnu [!m68k], realpath (>= 1.9.12), chrpath, lsb-release, quilt + dejagnu [!m68k], coreutils (>= 8.23-1~), chrpath, lsb-release, quilt Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, Homepage: http://gcc.gnu.org/ Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.9/ @@ -495,135 +495,6 @@ This package contains the headers and static library files needed to build GNU Fortran applications. -Package: gccgo-4.9 -Architecture: any -Priority: optional -Depends: gcc-4.9-base (= ${gcc:Version}), gcc-4.9 (= ${gcc:Version}), libgo5 (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends} -Provides: go-compiler -Suggests: ${go:multilib}, gccgo-4.9-doc, libgo5-dbg (>= ${gcc:Version}) -Description: GNU Go compiler - This is the GNU Go compiler, which compiles Go on platforms supported - by the gcc compiler. It uses the gcc backend to generate optimized code. - -Package: gccgo-4.9-multilib -Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32 -Section: devel -Priority: optional -Depends: gcc-4.9-base (= ${gcc:Version}), gccgo-4.9 (= ${gcc:Version}), gcc-4.9-multilib (= ${gcc:Version}), ${dep:libgobiarch}, ${shlibs:Depends}, ${misc:Depends} -Suggests: ${dep:libgobiarchdbg} -Description: GNU Go compiler (multilib support) - This is the GNU Go compiler, which compiles Go on platforms supported - by the gcc compiler. - . - This is a dependency package, depending on development packages - for the non-default multilib architecture(s). - -Package: libgo5 -Section: libs -Architecture: any -Provides: libgo5-armel [armel], libgo5-armhf [armhf] -Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Priority: optional -Depends: gcc-4.9-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} -Replaces: libgo3 -Description: Runtime library for GNU Go applications - Library needed for GNU Go applications linked against the - shared library. - -Package: libgo5-dbg -Section: debug -Architecture: any -Provides: libgo5-dbg-armel [armel], libgo5-dbg-armhf [armhf] -Multi-Arch: same -Priority: extra -Depends: gcc-4.9-base (= ${gcc:Version}), libgo5 (= ${gcc:Version}), ${misc:Depends} -Description: Runtime library for GNU Go applications (debug symbols) - Library needed for GNU Go applications linked against the - shared library. This currently is an empty package, because the - library is completely unstripped. - -Package: lib64go5 -Section: libs -Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32 -Priority: optional -Depends: gcc-4.9-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Replaces: lib64go3 -Description: Runtime library for GNU Go applications (64bit) - Library needed for GNU Go applications linked against the - shared library. - -Package: lib64go5-dbg -Section: debug -Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32 -Priority: extra -Depends: gcc-4.9-base (= ${gcc:Version}), lib64go5 (= ${gcc:Version}), ${misc:Depends} -Description: Runtime library for GNU Go applications (64bit debug symbols) - Library needed for GNU Go applications linked against the - shared library. This currently is an empty package, because the - library is completely unstripped. - -Package: lib32go5 -Section: libs -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el -Priority: optional -Depends: gcc-4.9-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Conflicts: ${confl:lib32} -Replaces: lib32go3 -Description: Runtime library for GNU Go applications (32bit) - Library needed for GNU Go applications linked against the - shared library. - -Package: lib32go5-dbg -Section: debug -Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el -Priority: extra -Depends: gcc-4.9-base (= ${gcc:Version}), lib32go5 (= ${gcc:Version}), ${misc:Depends} -Description: Runtime library for GNU Go applications (32 bit debug symbols) - Library needed for GNU Go applications linked against the - shared library. This currently is an empty package, because the - library is completely unstripped. - -Package: libn32go5 -Section: libs -Architecture: mips mipsel mips64 mips64el -Priority: optional -Depends: gcc-4.9-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Replaces: libn32go3 -Description: Runtime library for GNU Go applications (n32) - Library needed for GNU Go applications linked against the - shared library. - -Package: libn32go5-dbg -Section: debug -Architecture: mips mipsel mips64 mips64el -Priority: extra -Depends: gcc-4.9-base (= ${gcc:Version}), libn32go5 (= ${gcc:Version}), ${misc:Depends} -Description: Runtime library for GNU Go applications (n32 debug symbols) - Library needed for GNU Go applications linked against the - shared library. This currently is an empty package, because the - library is completely unstripped. - -Package: libx32go5 -Section: libs -Architecture: amd64 i386 -Priority: optional -Depends: gcc-4.9-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Replaces: libx32go3 -Description: Runtime library for GNU Go applications (x32) - Library needed for GNU Go applications linked against the - shared library. - -Package: libx32go5-dbg -Section: debug -Architecture: amd64 i386 -Priority: extra -Depends: gcc-4.9-base (= ${gcc:Version}), libx32go5 (= ${gcc:Version}), ${misc:Depends} -Description: Runtime library for GNU Go applications (x32 debug symbols) - Library needed for GNU Go applications linked against the - shared library. This currently is an empty package, because the - library is completely unstripped. - Package: gcj-4.9 Section: java Architecture: any diff -u gcc-4.9-4.9.4/debian/control.m4 gcc-4.9-4.9.4/debian/control.m4 --- gcc-4.9-4.9.4/debian/control.m4 +++ gcc-4.9-4.9.4/debian/control.m4 @@ -62,7 +62,7 @@ CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP, autogen, zlib1g-dev, gawk, lzma, xz-utils, patchutils, zlib1g-dev, SDT_BUILD_DEP - bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, quilt + bison (>= 1:2.3), flex, coreutils (>= 8.23-1~), lsb-release, quilt ',`dnl native Build-Depends: debhelper (>= 5.0.62), DPKG_BUILD_DEP GCC_MULTILIB_BUILD_DEP @@ -78,7 +78,7 @@ texinfo (>= 4.3), locales, sharutils, procps, FORTRAN_BUILD_DEP JAVA_BUILD_DEP GNAT_BUILD_DEP GO_BUILD_DEP GDC_BUILD_DEP CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP - CHECK_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, quilt + CHECK_BUILD_DEP coreutils (>= 8.23-1~), chrpath, lsb-release, quilt Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP ')dnl ifelse(regexp(SRCNAME, `gnat'),0,`dnl diff -u gcc-4.9-4.9.4/debian/rules.defs gcc-4.9-4.9.4/debian/rules.defs --- gcc-4.9-4.9.4/debian/rules.defs +++ gcc-4.9-4.9.4/debian/rules.defs @@ -748,6 +748,7 @@ ifeq ($(go_no_cross)-$(DEB_CROSS),yes-yes) with_go := disabled for cross compiler package endif +with_go := disabled for legacy raspbian compiler package due to build failure. with_go := $(call envfilt, go, , , $(with_go)) # Build all packages needed for Go development @@ -1248,7 +1249,7 @@ # run testsuite --------------- with_check := yes # if you don't want to run the gcc testsuite, uncomment the next line -#with_check := disabled by hand +with_check := disabled by plugwash ifeq ($(with_base_only),yes) with_check := no endif diff -u gcc-4.9-4.9.4/debian/rules.parameters gcc-4.9-4.9.4/debian/rules.parameters --- gcc-4.9-4.9.4/debian/rules.parameters +++ gcc-4.9-4.9.4/debian/rules.parameters @@ -2,14 +2,14 @@ GCC_VERSION := 4.9.4 NEXT_GCC_VERSION := 4.9.5 BASE_VERSION := 4.9 -SOURCE_VERSION := 4.9.4-1 -DEB_VERSION := 4.9.4-1 -DEB_EVERSION := 1:4.9.4-1 -DEB_GDC_VERSION := 4.9.4-1 +SOURCE_VERSION := 4.9.4-2+rpi1 +DEB_VERSION := 4.9.4-2+rpi1 +DEB_EVERSION := 1:4.9.4-2+rpi1 +DEB_GDC_VERSION := 4.9.4-2+rpi1 DEB_SOVERSION := 4.9 DEB_SOEVERSION := 1:4.9 DEB_LIBGCC_SOVERSION := -DEB_LIBGCC_VERSION := 1:4.9.4-1 +DEB_LIBGCC_VERSION := 1:4.9.4-2+rpi1 DEB_STDCXX_SOVERSION := 4.9 DEB_GCJ_SOVERSION := 4.9 PKG_GCJ_EXT := 15 diff -u gcc-4.9-4.9.4/debian/rules.patch gcc-4.9-4.9.4/debian/rules.patch --- gcc-4.9-4.9.4/debian/rules.patch +++ gcc-4.9-4.9.4/debian/rules.patch @@ -91,6 +91,7 @@ pr60655-debug-loc \ pr56158 \ r214683 \ + asan-fix-missing-include-signal-h \ # sigaction on sparc changed between glibc 2.19 and 2.21 ifeq (,$(filter 2.1%, $(shell dpkg-query -l libc-bin | awk '/^.i/ {print $$3}'))) only in patch2: unchanged: --- gcc-4.9-4.9.4.orig/debian/patches/asan-fix-missing-include-signal-h.diff +++ gcc-4.9-4.9.4/debian/patches/asan-fix-missing-include-signal-h.diff @@ -0,0 +1,39 @@ +Taken from https://raw.githubusercontent.com/buildroot/buildroot/master/package/gcc/4.9.4/942-asan-fix-missing-include-signal-h.patch +Modifed for path used in Debian package and defuzzed by plugwash. +Hopefully this works for armhf as well as powerpc. -- plugwash +From 205aa8e97bab553e5e6fe45896325e97962de704 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer +Date: Wed, 8 Feb 2017 11:42:52 +0100 +Subject: [PATCH] asan: fix missing include of signal.h + +This breaks when building gcc 4.9.4 / 5.4.0 with +target_platform=powerpc-unknown-linux-gnu with glibc 2.25: + +../../../../gcc-host/libsanitizer/asan/asan_linux.cc: In function 'bool __asan::AsanInterceptsSignal(int)': +../../../../gcc-host/libsanitizer/asan/asan_linux.cc:222:20: error: 'SIGSEGV' was not declared in this scope + return signum == SIGSEGV && common_flags()->handle_segv; + +This has been verified to apply to at least 4.9.4 and up to 5.4, +the code has been reworked for gcc 6. + +Resolves (Buildroot) Bug: https://bugs.busybox.net/show_bug.cgi?id=10061 + +Upstream: https://patchwork.ozlabs.org/patch/725596/ + +Signed-off-by: Matthew Weber +--- + libsanitizer/asan/asan_linux.cc | 1 + + 1 file changed, 1 insertion(+) + +Index: gcc-4.9-4.9.4/src/libsanitizer/asan/asan_linux.cc +=================================================================== +--- gcc-4.9-4.9.4.orig/src/libsanitizer/asan/asan_linux.cc ++++ gcc-4.9-4.9.4/src/libsanitizer/asan/asan_linux.cc +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include