diff -u gcc-4.7-4.7.3/debian/changelog gcc-4.7-4.7.3/debian/changelog --- gcc-4.7-4.7.3/debian/changelog +++ gcc-4.7-4.7.3/debian/changelog @@ -1,3 +1,11 @@ +gcc-4.7 (4.7.3-9+rpi1) jessie-staging; urgency=low + + * Set defaults for raspbian (ARMv6+VFP) + * Disable testsuite + * Don't apply ubuntu specific patches on unknown derivatives. + + -- Peter Michael Green Fri, 20 Dec 2013 20:50:56 +0000 + gcc-4.7 (4.7.3-9) unstable; urgency=low * Update to SVN 20131109 (r204613) from the gcc-4_7-branch. diff -u gcc-4.7-4.7.3/debian/control gcc-4.7-4.7.3/debian/control --- gcc-4.7-4.7.3/debian/control +++ gcc-4.7-4.7.3/debian/control @@ -5,7 +5,7 @@ Uploaders: Matthias Klose Standards-Version: 3.9.4 Build-Depends: debhelper (>= 5.0.62), gcc-4.8-base, - libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5) , libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32], libn32gcc1 [mips mipsel], lib64gcc1 [i386 mips mipsel powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], + libc6.1-dev (>= 2.13-0ubuntu6) [alpha ia64] | libc0.3-dev (>= 2.13-0ubuntu6) [hurd-i386] | libc0.1-dev (>= 2.13-0ubuntu6) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-0ubuntu6) , libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-sparc [sparc64], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32], libn32gcc1 [mips mipsel], lib64gcc1 [i386 mips mipsel powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], m4, libtool, autoconf2.64, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, @@ -78,24 +78,13 @@ This package contains the headers and static library files necessary for building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. -Package: libx32gcc-4.7-dev -Architecture: amd64 i386 -Section: libdevel -Priority: optional -Recommends: ${dep:libcdev} -Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends} -Replaces: gcc-4.7-multilib (<< ${gcc:SplitVersion}) -Description: GCC support library (x32 development files) - This package contains the headers and static library files necessary for - building C programs which use libgcc, libgomp, libquadmath, libssp or libitm. - Package: gcc-4.7 Architecture: any Section: devel Priority: optional Depends: gcc-4.7-base (= ${gcc:Version}), cpp-4.7 (= ${gcc:Version}), binutils (>= ${binutils:Version}), libgcc-4.7-dev (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: ${dep:libcdev} -Suggests: ${gcc:multilib}, libmudflap0-4.7-dev (>= ${gcc:Version}), gcc-4.7-doc (>= ${gcc:SoftVersion}), gcc-4.7-locales (>= ${gcc:SoftVersion}), libgcc1-dbg (>= ${libgcc:Version}), libgomp1-dbg (>= ${gcc:Version}), libitm1-dbg (>= ${gcc:Version}), libquadmath0-dbg (>= ${gcc:Version}), libmudflap0-dbg (>= ${gcc:Version}), ${dep:libcloog}, ${dep:gold} +Suggests: ${gcc:multilib}, libmudflap0-4.7-dev (>= ${gcc:Version}), gcc-4.7-doc (>= ${gcc:SoftVersion}), gcc-4.7-locales (>= ${gcc:SoftVersion}), libgcc1-dbg (>= ${libgcc:Version}), libgomp1-dbg (>= ${gcc:Version}), libitm1-dbg (>= ${gcc:Version}), libquadmath-dbg (>= ${gcc:Version}), libmudflap0-dbg (>= ${gcc:Version}), ${dep:libcloog}, ${dep:gold} Provides: c-compiler Description: GNU C compiler This is the GNU C compiler, a fairly portable optimizing compiler for C. @@ -295,16 +284,6 @@ This package contains the headers and static library files needed to build GNU ObjC applications. -Package: libx32objc-4.7-dev -Architecture: amd64 i386 -Section: libdevel -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), libx32gcc-4.7-dev (= ${gcc:Version}), libx32objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} -Replaces: gobjc-4.7-multilib (<< ${gcc:SplitVersion}) -Description: Runtime library for GNU Objective-C applications (x32 development files) - This package contains the headers and static library files needed to build - GNU ObjC applications. - Package: gfortran-4.7 Architecture: any Priority: optional @@ -373,17 +352,6 @@ This package contains the headers and static library files needed to build GNU Fortran applications. -Package: libx32gfortran-4.7-dev -Architecture: amd64 i386 -Section: libdevel -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), libx32gfortran3 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends} -Replaces: gfortran-4.7-multilib (<< ${gcc:SplitVersion}) -Breaks: gfortran-4.7-multilib (<< ${gcc:SplitVersion}) -Description: Runtime library for GNU Fortran applications (x32 development files) - This package contains the headers and static library files needed to build - GNU Fortran applications. - Package: gccgo-4.7 Architecture: any Priority: optional @@ -486,24 +454,6 @@ Library needed for GNU Go applications linked against the shared library. -Package: libx32go0 -Section: libs -Architecture: amd64 i386 -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends} -Description: Runtime library for GNU Go applications (x32) - Library needed for GNU Go applications linked against the - shared library. - -Package: libx32go0-dbg -Section: debug -Architecture: amd64 i386 -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), libx32go0 (= ${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. - Package: libstdc++6-4.7-dev Architecture: any Multi-Arch: same @@ -621,31 +571,6 @@ Description: GNU Standard C++ Library v3 (debugging files) This package contains the shared library of libstdc++ compiled with debugging symbols. - -Package: libx32stdc++6-4.7-dev -Architecture: amd64 i386 -Section: libdevel -Priority: optional -Depends: gcc-4.7-base (= ${gcc:Version}), libx32gcc-4.7-dev (= ${gcc:Version}), libx32stdc++6 (>= ${gcc:Version}), libstdc++6-4.7-dev (= ${gcc:Version}), ${misc:Depends} -Replaces: libstdc++6-4.7-dev (<< ${gcc:SplitVersion}), g++-4.7-multilib (<< ${gcc:SplitVersion}) -Breaks: libstdc++6-4.7-dev (<< ${gcc:SplitVersion}), g++-4.7-multilib (<< ${gcc:SplitVersion}) -Description: GNU Standard C++ Library v3 (development files) - This package contains the headers and static library files necessary for - building C++ programs which use libstdc++. - . - libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which - was included up to g++-2.95. The first version of libstdc++-v3 appeared - in g++-3.0. - -Package: libx32stdc++6-4.7-dbg -Architecture: amd64 i386 -Section: debug -Priority: extra -Depends: gcc-4.7-base (= ${gcc:Version}), libx32stdc++6 (>= ${gcc:Version}), libstdc++6-4.7-dev (= ${gcc:Version}), libx32gcc1-dbg (>= ${gcc:EpochVersion}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: libx32stdc++6-dbg, libx32stdc++6-4.0-dbg, libx32stdc++6-4.1-dbg, libx32stdc++6-4.2-dbg, libx32stdc++6-4.3-dbg, libx32stdc++6-4.4-dbg, libx32stdc++6-4.5-dbg, libx32stdc++6-4.6-dbg -Description: GNU Standard C++ Library v3 (debugging files) - This package contains the shared library of libstdc++ compiled with - debugging symbols. Package: libstdc++6-4.7-doc Architecture: all diff -u gcc-4.7-4.7.3/debian/rules.defs gcc-4.7-4.7.3/debian/rules.defs --- gcc-4.7-4.7.3/debian/rules.defs +++ gcc-4.7-4.7.3/debian/rules.defs @@ -920,7 +920,7 @@ with_ssp := $(call envfilt, ssp, , , $(with_ssp)) ifeq ($(with_ssp),yes) - ifneq ($(distribution),Debian) + ifeq ($(distribution),Ubuntu) ifneq (,$(findstring gcc-4, $(PKGSOURCE))) with_ssp_default := yes endif @@ -1111,7 +1111,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.7-4.7.3/debian/rules.parameters gcc-4.7-4.7.3/debian/rules.parameters --- gcc-4.7-4.7.3/debian/rules.parameters +++ gcc-4.7-4.7.3/debian/rules.parameters @@ -29,7 +29,7 @@ SSP_SONAME := 0 GOMP_SONAME := 1 ITM_SONAME := 1 -QMATH_SONAME := 0 +QMATH_SONAME := GCCMATH_SONAME := GO_SONAME := 0 LIBC_DEP := libc6 diff -u gcc-4.7-4.7.3/debian/rules.patch gcc-4.7-4.7.3/debian/rules.patch --- gcc-4.7-4.7.3/debian/rules.patch +++ gcc-4.7-4.7.3/debian/rules.patch @@ -104,7 +104,7 @@ # libjava-rpath \ hardening_patches = -ifneq ($(distribution),Debian) +ifeq ($(distribution),Ubuntu) ifneq (,$(findstring gcc-4, $(PKGSOURCE))) hardening_patches += gcc-default-format-security \ gcc-default-fortify-source \ diff -u gcc-4.7-4.7.3/debian/rules2 gcc-4.7-4.7.3/debian/rules2 --- gcc-4.7-4.7.3/debian/rules2 +++ gcc-4.7-4.7.3/debian/rules2 @@ -387,9 +387,9 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else # armel ifeq ($(distribution),Debian) @@ -401,9 +401,9 @@ ifneq (,$(findstring gcj,$(PKGSOURCE))) with_arm_arch = armv6 else - with_arm_arch = armv7-a + with_arm_arch = armv6 endif - with_arm_fpu = vfpv3-d16 + with_arm_fpu = vfp else with_arm_arch = armv5t # starting with quantal endif @@ -414,7 +414,7 @@ endif CONFARGS += --with-float=$(float_abi) ifeq ($(with_arm_thumb),yes) - CONFARGS += --with-mode=thumb + # CONFARGS += --with-mode=thumb endif endif