diff -u gcj-4.6-4.6.3/debian/rules.parameters gcj-4.6-4.6.3/debian/rules.parameters --- gcj-4.6-4.6.3/debian/rules.parameters +++ gcj-4.6-4.6.3/debian/rules.parameters @@ -2,15 +2,15 @@ GCC_VERSION := 4.6.3 NEXT_GCC_VERSION := 4.6.4 BASE_VERSION := 4.6 -SOURCE_VERSION := 4.6.3-1 -DEB_VERSION := 4.6.3-1 -DEB_EVERSION := 1:4.6.3-1 +SOURCE_VERSION := 4.6.3-1ubuntu1 +DEB_VERSION := 4.6.3-1ubuntu1 +DEB_EVERSION := 1:4.6.3-1ubuntu1 GDC_BASE_VERSION := DEB_GDC_VERSION := DEB_SOVERSION := 4.6 DEB_SOEVERSION := 1:4.6 DEB_LIBGCC_SOVERSION := 1:4.6 -DEB_LIBGCC_VERSION := 1:4.6.3-1 +DEB_LIBGCC_VERSION := 1:4.6.3-1ubuntu1 DEB_STDCXX_SOVERSION := 4.6 DEB_GCJ_SOVERSION := 4.6 PKG_GCJ_EXT := 12 diff -u gcj-4.6-4.6.3/debian/control gcj-4.6-4.6.3/debian/control --- gcj-4.6-4.6.3/debian/control +++ gcj-4.6-4.6.3/debian/control @@ -1,10 +1,11 @@ Source: gcj-4.6 Section: devel Priority: optional -Maintainer: Debian GCC Maintainers +Maintainer: Ubuntu Core developers +XSBC-Original-Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose , Arthur Loiret Standards-Version: 3.9.3 -Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc], 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-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.64, automake (>= 1:1.11), automake (<< 1:1.12), libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.21.1) | binutils-multiarch (>= 2.21.1), binutils-hppa64 (>= 2.21.1) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!knetbsd-i386 !knetbsd-alpha], procps, sharutils, libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [!knetbsd-i386 !knetbsd-alpha !hurd-i386 !hurd-alpha !kfreebsd-i386 !kfreebsd-amd64 !knetbsd-i386 !knetbsd-alpha], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, g++-4.6 [armel armhf], gcc-4.6-source (>= 4.6.3), gcc-4.6-source (<< 4.6.4), libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12), dejagnu [!m68k !hurd-i386 !hurd-alpha], realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt +Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 armel armhf i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc], 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], libc6-dev-armhf [armel], libc6-dev-armel [armhf], m4, libtool, autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.21.1) | binutils-multiarch (>= 2.21.1), binutils-hppa64 (>= 2.21.1) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!knetbsd-i386 !knetbsd-alpha], procps, sharutils, libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [!knetbsd-i386 !knetbsd-alpha !hurd-i386 !hurd-alpha !kfreebsd-i386 !kfreebsd-amd64 !knetbsd-i386 !knetbsd-alpha], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, g++-4.6 [armel armhf], gcc-4.6-source (>= 4.6.3), gcc-4.6-source (<< 4.6.4), libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12), dejagnu [!m68k !hurd-i386 !hurd-alpha], realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt Build-Conflicts: binutils-gold Homepage: http://gcc.gnu.org/ XS-Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.6/ reverted: --- gcj-4.6-4.6.3/debian/README.Debian.i386 +++ gcj-4.6-4.6.3.orig/debian/README.Debian.i386 @@ -1,213 +0,0 @@ - -gcc-gfdl-build: - Build a dummy s-tm-texi without access to the texinfo sources - -gcc-textdomain: - Set gettext's domain and textdomain to the versioned package name. - -gcc-driver-extra-langs: - Add options and specs for languages that are not built from a source - (but built from separate sources). - -gcc-hash-style-both: - Link using --hash-style=both (alpha, amd64, armel, armhf, ia64, i386, powerpc, ppc64, s390, sparc) - -libstdc++-pic: - Build and install libstdc++_pic.a library. - -libstdc++-doclink: - adjust hrefs to point to the local documentation - -libstdc++-man-3cxx: - Install libstdc++ man pages with suffix .3cxx instead of .3 - -libstdc++-test-installed: - Add support to run the libstdc++-v3 testsuite using the - installed shared libraries. - -libjava-stacktrace: - libgcj: Lookup source file name and line number in separated - debug files found in /usr/lib/debug - -libjava-jnipath: - - Add /usr/lib/jni and /usr/lib//jni to java.library.path. - - When running the i386 binaries on amd64, look in - - /usr/lib32/gcj-x.y and /usr/lib32/jni instead. - -libjava-sjlj: - Don't try to use _Unwind_Backtrace on SJLJ targets. - See bug #387875, #388505, GCC PR 29206. - -libjava-disable-plugin: - Don't build the gcjwebplugin, even when configured with --enable-plugin - -alpha-no-ev4-directive: - never emit .ev4 directive. - -boehm-gc-getnprocs: - boehm-gc/pthread_support.c (GC_get_nprocs): Use sysconf as fallback. - -note-gnu-stack: - Add .note.GNU-stack sections for gcc's crt files, libffi and boehm-gc - Taken from FC. - -libgomp-omp_h-multilib: - Fix up omp.h for multilibs. - -sparc-force-cpu: - On sparc default to ultrasparc (v9a) in 32bit mode - -pr24619: - Proposed patch for PR mudflap/24619 (instrumentation of dlopen) - -pr45979: - -gccgo-version: - Omit the subminor number from the go libdir - -no_fpr_in_libgcc: - It does not really harm by including them since nobody should use them - but gas does not wont to assmebly hard float since they are not - available on this cpu. Upstream did not respond. - -pr48226: - Fix PR target/48226, Allow Iterator::vector vector on powerpc with VSX. - -pr47487: - Fix PR target/47487 powerpc64 ICE building libgo - -gcc-dw2-loc-tracking: - Reducing the overhead of dwarf2 location tracking - -mudflap-varargs: - Add mudflap support for varargs - -pr45078: - Proposed patch for PR plugin/45078 - -pr43804: - Fix for PR target/43804 backported from SVN - -pr48830: - Fix for PR rtl-optimization/{48830,48808,48792}, taken from the trunk. - -pr49169: - * Fix PR tree-optimization/49169, optimisations strip the Thumb/ARM mode bit - off function pointers (Richard Sandiford). - -pr49756: - Fix PR c++/49756, backport from trunk - -pr49940: - Apply proposed patch for PR ada/49940. - -pr49944: - apply proposed patch for PR ada/49444. - -gcc-cloog-dl: - Link against -ldl instead of -lcloog -lppl. Exit with an error when using - the Graphite loop transformation infrastructure without having the - libcloog-ppl0 package installed. Packages using these optimizations - should build-depend on libcloog-ppl0. - -libffi-kfreebsd: - libffi: Define FFI_MMAP_EXEC_WRIT on kfreebsd-*. - -gcc-base-version: - Set base version to 4.6, introduce full version 4.6.x. - -pr49696: - -libffi-powerpc-sf: - -gcc-d-lang: - Add D options and specs for the gcc driver. - -01-arm-64bitintrinsics-v2: - -03-arm-pr48126-syncpos-v2: - -04-arm-dmbmcr: - -arm-multilib: - ARM hard/soft float multilib - -libjava-disable-static: - Disable building the static libjava. - -s390-biarch: - Build a bi-arch compiler on s390-linux-gnu. - http://gcc.gnu.org/ml/gcc-patches/2009-03/msg01044.html - -mips-triarch: - Build a tri-arch compiler on mips-linux-gnu. - http://gcc.gnu.org/ml/gcc-patches/2009-03/msg01047.html - -gcc-ice-hack: - Retry the build on an ice, save the calling options and preprocessed - source when the ice is reproducible. - -gcc-ice-apport: - Report an ICE to apport (if apport is available - and the environment variable GCC_NOAPPORT is not set) - -libjava-fixed-symlinks: - Remove unneed '..' elements from symlinks in JAVA_HOME - -libstdc++-arm-wno-abi: - Temporary work around: - On arm-linux-gnueabi run the libstdc++v3 testsuite with -Wno-abi - -ada-mips: - Improve support for mips. - -libffi-ro-eh_frame_sect: - PR libffi/47248, force a read only eh frame section. - -arm-unbreak-eabi-armv4t: - Fix armv4t build on ARM - -gcc-multiarch: - Add multiarch support to GCC. - - Convert the multilib option to a target triplet, - add multiarch include directories and libraries path: - /usr/local/include/-linux-gnu - /usr/include/-linux-gnu - /usr/lib/-linux-gnu - to the system paths. - -libjava-multiarch: - Install libjava libraries to multiarch location - -libjava-nobiarch-check: - For biarch builds, disable the testsuite for the non-default architecture - for runtime libraries, which are not built by default (libjava). - -config-ml: - disable some biarch libraries for biarch builds - -gcc-powerpc-nof: - Don't build nof multlib on powerpc. - -gcc-powerpc-undef: - Undefine LINK_EH_SPEC before redefining it - http://gcc.gnu.org/ml/gcc-patches/2011-02/msg01082.html - -gcc-no-add-needed: - On linux targets pass --no-add-needed to the linker. - -mips-fix-loongson2f-nop: - On mips, pass -mfix-loongson2f-nop to as, if -mno-fix-loongson2f-nop - is not passed. - -gcc-system-root: - Avoid include paths starting with a double slash - -libgomp-kfreebsd-testsuite: - Disable lock-2.c test on kfreebsd-* - -armhf-triplet: - add support for arm-linux-*eabi* triplets; useful for armhf - -address-clauses-timed-entry-calls: diff -u gcj-4.6-4.6.3/debian/changelog gcj-4.6-4.6.3/debian/changelog --- gcj-4.6-4.6.3/debian/changelog +++ gcj-4.6-4.6.3/debian/changelog @@ -1,14 +1,32 @@ +gcj-4.6 (4.6.3-1ubuntu1) precise; urgency=low + + * Regenerate the control file. + + -- Matthias Klose Sat, 03 Mar 2012 13:34:08 +0100 + gcj-4.6 (4.6.3-1) unstable; urgency=low * GCC 4.6.3 release. -- Matthias Klose Fri, 02 Mar 2012 01:42:32 +0100 -gcj-4.6 (4.6.2-2) unstable; urgency=medium +gcj-4.6 (4.6.2-2ubuntu2) precise; urgency=low + + * Fix applying patches. + + -- Matthias Klose Tue, 29 Nov 2011 17:48:48 +0100 + +gcj-4.6 (4.6.2-2ubuntu1) precise; urgency=low + + * Sync packaging with gcc-4.6 4.6.2-5ubuntu1. + + -- Matthias Klose Thu, 24 Nov 2011 17:50:31 +0100 - * Sync packaging with gcc-4.6 4.6.2-4. +gcj-4.6 (4.6.2-1ubuntu1) precise; urgency=low - -- Matthias Klose Mon, 14 Nov 2011 22:20:22 +0100 + * Sync packaging with gcc-4.6 4.6.2-1ubuntu1. + + -- Matthias Klose Fri, 28 Oct 2011 08:58:51 +0200 gcj-4.6 (4.6.2-1) unstable; urgency=low @@ -22,60 +40,72 @@ -- Matthias Klose Tue, 11 Oct 2011 16:19:34 +0200 -gcj-4.6 (4.6.1-9) unstable; urgency=low +gcj-4.6 (4.6.1-9ubuntu3) precise; urgency=low - * Upload as 4.6.1-9 to match gcc-defaults dependencies. + * Fix libffi build on powerpc. - -- Matthias Klose Tue, 27 Sep 2011 23:55:55 +0200 + -- Matthias Klose Wed, 12 Oct 2011 18:23:25 +0200 -gcj-4.6 (4.6.1-6) unstable; urgency=low +gcj-4.6 (4.6.1-9ubuntu2) precise; urgency=low - * Sync packaging with gcc-4.6 4.6.1-13. + * Fix libjava installation into /usr/lib/gcc//4.6. - -- Matthias Klose Tue, 27 Sep 2011 00:46:46 +0200 + -- Matthias Klose Tue, 11 Oct 2011 23:06:44 +0200 -gcj-4.6 (4.6.1-5) unstable; urgency=medium +gcj-4.6 (4.6.1-9ubuntu1) precise; urgency=low - * Sync packaging with gcc-4.6 4.6.1-11. + * Sync packaging with gcc-4.6 4.6.1-15ubuntu1. - -- Matthias Klose Sat, 17 Sep 2011 14:18:17 +0200 + -- Matthias Klose Tue, 11 Oct 2011 16:21:07 +0200 -gcj-4.6 (4.6.1-4) unstable; urgency=low +gcj-4.6 (4.6.1-4ubuntu2) oneiric; urgency=low - * Sync packaging with gcc-4.6 4.6.1-8. + * Sync packaging with gcc-4.6 4.6.1-9ubuntu3. - -- Matthias Klose Wed, 24 Aug 2011 10:48:27 +0200 + -- Matthias Klose Sat, 17 Sep 2011 14:03:41 +0200 -gcj-4.6 (4.6.1-3) unstable; urgency=low +gcj-4.6 (4.6.1-4ubuntu1) oneiric; urgency=low - * Sync packaging with gcc-4.6 4.6.1-7. + * Upload as -4ubuntu1 to resolve break with gcc-4.6-base. - -- Matthias Klose Tue, 16 Aug 2011 13:44:15 +0200 + -- Matthias Klose Wed, 24 Aug 2011 09:56:29 +0200 -gcj-4.6 (4.6.1-2) unstable; urgency=low +gcj-4.6 (4.6.1-3ubuntu4) oneiric; urgency=low - * Sync packaging with gcc-4.6 4.6.1-3. + * Don't build using the system libffi library. - -- Matthias Klose Sun, 10 Jul 2011 09:58:18 +0200 + -- Matthias Klose Tue, 23 Aug 2011 16:04:59 +0200 -gcj-4.6 (4.6.1-1) unstable; urgency=low +gcj-4.6 (4.6.1-3ubuntu3) oneiric; urgency=low - * GCC 4.6.1 release. + * Sync packaging with gcc-4.6 4.6.1-7ubuntu2. + + -- Matthias Klose Tue, 23 Aug 2011 09:38:47 +0200 + +gcj-4.6 (4.6.1-3ubuntu2) oneiric; urgency=low + + * Don't build libjava multilib on armel. - -- Matthias Klose Mon, 27 Jun 2011 19:30:00 +0200 + -- Matthias Klose Wed, 17 Aug 2011 16:25:01 +0200 -gcj-4.6 (4.6.0-13) unstable; urgency=low +gcj-4.6 (4.6.1-3ubuntu1) oneiric; urgency=low - * Sync packaging with gcc-4.6 4.6.0-12. + * Sync packaging with gcc-4.6 4.6.1-7ubuntu1. + + -- Matthias Klose Tue, 16 Aug 2011 13:40:44 +0200 + +gcj-4.6 (4.6.1-2ubuntu1) oneiric; urgency=low + + * GCC 4.6.1 release. + * Sync packaging with gcc-4.6 4.6.1-2ubuntu1. - -- Matthias Klose Sun, 12 Jun 2011 09:50:50 +0200 + -- Matthias Klose Mon, 04 Jul 2011 20:00:13 +0200 -gcj-4.6 (4.6.0-4) unstable; urgency=low +gcj-4.6 (4.6.0-3ubuntu1) natty; urgency=low - * Sync packaging with gcc-4.6 4.6.0-12. - * Enable multiarch. + * Update oneiric build depends. - -- Matthias Klose Thu, 09 Jun 2011 11:19:48 +0200 + -- Matthias Klose Fri, 22 Apr 2011 09:17:37 +0200 gcj-4.6 (4.6.0-3) unstable; urgency=low diff -u gcj-4.6-4.6.3/debian/patches/gcc-linaro.diff gcj-4.6-4.6.3/debian/patches/gcc-linaro.diff --- gcj-4.6-4.6.3/debian/patches/gcc-linaro.diff +++ gcj-4.6-4.6.3/debian/patches/gcc-linaro.diff @@ -14117,45 +14117,6 @@ alpha*-*-linux*) case ${target} in alpha*-*-linux*) ---- a/src/gcc/configure -+++ b/src/gcc/configure -@@ -1647,7 +1647,8 @@ - use sysroot as the system root during the build - --with-sysroot=DIR Search for usr/lib, usr/include, et al, within DIR. - --with-specs=SPECS add SPECS to driver command-line processing -- --with-pkgversion=PKG Use PKG in the version string in place of "GCC" -+ --with-pkgversion=PKG Use PKG in the version string in place of "Linaro -+ GCC `cat $srcdir/LINARO-VERSION`" - --with-bugurl=URL Direct users to URL to report a bug - --with-multilib-list Select multilibs (SH only) - --with-gnu-ld assume the C compiler uses GNU ld default=no -@@ -7129,7 +7130,7 @@ - *) PKGVERSION="($withval) " ;; - esac - else -- PKGVERSION="(GCC) " -+ PKGVERSION="(Linaro GCC `cat $srcdir/LINARO-VERSION`) " - - fi - -@@ -17495,7 +17496,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 17498 "configure" -+#line 17499 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -17601,7 +17602,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 17604 "configure" -+#line 17605 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H --- a/src/gcc/configure.ac +++ b/src/gcc/configure.ac @@ -760,7 +760,7 @@