diff -u gcc-4.4-4.4.7/debian/changelog gcc-4.4-4.4.7/debian/changelog --- gcc-4.4-4.4.7/debian/changelog +++ gcc-4.4-4.4.7/debian/changelog @@ -1,3 +1,9 @@ +gcc-4.4 (4.4.7-8ubuntu7) xenial; urgency=medium + + * Build using gcc-4.7 on s390x. + + -- Matthias Klose Mon, 14 Dec 2015 01:14:03 +0100 + gcc-4.4 (4.4.7-8ubuntu6) xenial; urgency=medium * Build using gcc-4.4. diff -u gcc-4.4-4.4.7/debian/control gcc-4.4-4.4.7/debian/control --- gcc-4.4-4.4.7/debian/control +++ gcc-4.4-4.4.7/debian/control @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose , Arthur Loiret Standards-Version: 3.9.5 -Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-4.4, g++-multilib [amd64 i386 mips mipsel powerpc ppc64 s390 s390x sparc kfreebsd-amd64], 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-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x], lib64gcc1 [i386 powerpc sparc s390], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], m4, libtool, autoconf2.59, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.20.1-15~) | binutils-multiarch (>= 2.20.1-15~), binutils-hppa64 (>= 2.20.1-15~) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!knetbsd-i386 !knetbsd-alpha], procps, sharutils, libcloog-ppl-dev (>= 0.15.8-1~), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt +Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-4.4 [!s390x], g++-4.7 [s390x], g++-multilib [amd64 i386 mips mipsel powerpc ppc64 s390 s390x sparc kfreebsd-amd64], 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-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x], lib64gcc1 [i386 powerpc sparc s390], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], m4, libtool, autoconf2.59, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.20.1-15~) | binutils-multiarch (>= 2.20.1-15~), binutils-hppa64 (>= 2.20.1-15~) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!knetbsd-i386 !knetbsd-alpha], procps, sharutils, libcloog-pplv4-dev (>= 0.15.8-1~), libmpfr-dev (>= 3.0.0-9~), libgmpv4-dev (>= 2:5.0.1~), dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt Build-Depends-Indep: doxygen (>= 1.4.2), graphviz (>= 2.2), gsfonts-x11, texlive-latex-base, Homepage: http://gcc.gnu.org/ Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.4/ diff -u gcc-4.4-4.4.7/debian/control.m4 gcc-4.4-4.4.7/debian/control.m4 --- gcc-4.4-4.4.7/debian/control.m4 +++ gcc-4.4-4.4.7/debian/control.m4 @@ -48,7 +48,7 @@ ifdef(`TARGET',`dnl cross Build-Depends: DPKG_BUILD_DEP debhelper (>= 5.0.62), dpkg-cross (>= 1.25.99), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTOGEN_BUILD_DEP CLOOG_BUILD_DEP AUTO_BUILD_DEP SOURCE_BUILD_DEP CROSS_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP zlib1g-dev, gawk, lzma, xz-utils, patchutils, BINUTILS_BUILD_DEP, bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, make (>= 3.81), quilt ',`dnl native -Build-Depends: DPKG_BUILD_DEP debhelper (>= 5.0.62), g++-4.4, g++-multilib [amd64 i386 mips mipsel powerpc ppc64 s390 s390x sparc kfreebsd-amd64], LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP AUTO_BUILD_DEP AUTOGEN_BUILD_DEP libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), FORTRAN_BUILD_DEP locales [locale_no_archs], procps, sharutils, PASCAL_BUILD_DEP JAVA_BUILD_DEP GNAT_BUILD_DEP SPU_BUILD_DEP CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP ELF_BUILD_DEP CHECK_BUILD_DEP GDC_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt +Build-Depends: DPKG_BUILD_DEP debhelper (>= 5.0.62), g++-4.4 [!s390x], g++-4.7 [s390x], g++-multilib [amd64 i386 mips mipsel powerpc ppc64 s390 s390x sparc kfreebsd-amd64], LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP AUTO_BUILD_DEP AUTOGEN_BUILD_DEP libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), FORTRAN_BUILD_DEP locales [locale_no_archs], procps, sharutils, PASCAL_BUILD_DEP JAVA_BUILD_DEP GNAT_BUILD_DEP SPU_BUILD_DEP CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP ELF_BUILD_DEP CHECK_BUILD_DEP GDC_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP ')dnl dnl Build-Conflicts: qt3-dev-tools diff -u gcc-4.4-4.4.7/debian/rules.conf gcc-4.4-4.4.7/debian/rules.conf --- gcc-4.4-4.4.7/debian/rules.conf +++ gcc-4.4-4.4.7/debian/rules.conf @@ -241,12 +241,12 @@ GMP_BUILD_DEP = libgmp3-dev, MPFR_BUILD_DEP = libmpfr-dev, else - GMP_BUILD_DEP = libgmp-dev (>= 2:5.0.1~), + GMP_BUILD_DEP = libgmpv4-dev (>= 2:5.0.1~), MPFR_BUILD_DEP = libmpfr-dev (>= 3.0.0-9~), endif PPL_BUILD_DEP = libppl-dev (>= 0.10) | libppl0.10-dev (>= 0.10), -CLOOG_BUILD_DEP = libcloog-ppl-dev (>= 0.15.8-1~), +CLOOG_BUILD_DEP = libcloog-pplv4-dev (>= 0.15.8-1~), CLOOG_RUNTIME_DEP = libcloog-ppl0 (>= 0.15.8-1~), libppl-c2, libppl7 CLOOG_RUNTIME_DEP = libcloog-ppl1, libppl-c4, libppl13 # FIXME GCC-4.5 diff -u gcc-4.4-4.4.7/debian/rules.parameters gcc-4.4-4.4.7/debian/rules.parameters --- gcc-4.4-4.4.7/debian/rules.parameters +++ gcc-4.4-4.4.7/debian/rules.parameters @@ -2,9 +2,9 @@ GCC_VERSION := 4.4.7 NEXT_GCC_VERSION := 4.4.8 BASE_VERSION := 4.4 -SOURCE_VERSION := 4.4.7-8ubuntu4 -DEB_VERSION := 4.4.7-8ubuntu4 -DEB_EVERSION := 1:4.4.7-8ubuntu4 +SOURCE_VERSION := 4.4.7-8ubuntu7 +DEB_VERSION := 4.4.7-8ubuntu7 +DEB_EVERSION := 1:4.4.7-8ubuntu7 GPC_BASE_VERSION := GDC_BASE_VERSION := DEB_GPC_VERSION := @@ -12,7 +12,7 @@ DEB_SOVERSION := 4.4 DEB_SOEVERSION := 1:4.4 DEB_LIBGCC_SOVERSION := 1:4.4 -DEB_LIBGCC_VERSION := 1:4.4.7-8ubuntu4 +DEB_LIBGCC_VERSION := 1:4.4.7-8ubuntu7 DEB_STDCXX_SOVERSION := 4.4 DEB_GCJ_SOVERSION := 4.4 PKG_GCJ_EXT := 10 diff -u gcc-4.4-4.4.7/debian/rules.patch gcc-4.4-4.4.7/debian/rules.patch --- gcc-4.4-4.4.7/debian/rules.patch +++ gcc-4.4-4.4.7/debian/rules.patch @@ -70,7 +70,6 @@ note-gnu-stack \ pr25509 \ pr38333 \ - gcc-cloog-dl \ libgomp-omp_h-multilib \ sparc-force-cpu \ gcc-stack_chk_fail-check \ diff -u gcc-4.4-4.4.7/debian/rules2 gcc-4.4-4.4.7/debian/rules2 --- gcc-4.4-4.4.7/debian/rules2 +++ gcc-4.4-4.4.7/debian/rules2 @@ -84,6 +84,9 @@ CC = else CC = $(if $(filter yes,$(with_ada)),gnatgcc,gcc-4.4) + ifeq ($(DEB_TARGET_ARCH),s390x) + CC = gcc-4.7 + endif endif ifneq ($(distribution),Ubuntu)