Bug#707261: patch for #707261 please base gnat-4.6 on the gcc 4.6.4 release
tags 707261 + patch
thanks
Dear Maintainer,
since I’ve done the rebasing of gnat-4.6 against gcc-4.6 uploads
myself already as I’ve needed both during m68k porting work, I’ve
attached a diff (debian/ only) against gcc-4.6_4.6.4-2 (not against
the old gnat-4.6 code, since the README advises to just take the
gcc-4.6 package and reupload it; I’ve also rebased the changelog
to that effect except I ignored the harder-to-merge gnat-4.4 and
older entries; contact me if you absolutely require them, since
they’re merged in the gcc entries already). I also ran debian/rules
control on a system running sid to generate the correct d/control
and other files (including B-D).
I’m currently test-building this on a clean, minimal i386 sid
chroot with cowbuilder. If positive, I’ll upload this as NMU
if you give the okay or there is no maintainer activity for
a week. (I’m mostly confident in this, as this worked for me
on the m68k port several times already.)
bye,
//mirabilos
--
Gast: „Ein Bier, bitte!“
Wirt: „Geht auch alkoholfrei?“
Gast: „Geht auch Spielgeld?“
diff --git a/debian/README.maintainers b/debian/README.maintainers
index 129607e..1696e4a 100644
--- a/debian/README.maintainers
+++ b/debian/README.maintainers
@@ -5,36 +5,37 @@ one, or if you would like to create your own binary packages of GCC.
* Overview
-From the GCC sources, Debian currently builds 3 source packages and
-almost 100 binary packages, using a single set of build scripts. The
-3 source packages are:
+We have split the GCC into three source packages:
-gcc-4.3: C, C++, Fortran, Objective-C and Objective-C++, plus many
- common libraries like libssp, libmudflap, and libgcc.
-gcj-4.3: Java.
-gnat-4.3: Ada.
+- gcc-x.y requires only a C compiler to build and produces C, C++,
+ Fortran, Go and Objective-C compilers and libraries. It also
+ produces the binary package gcc-x.y-source containing all the
+ sources and patches in a tarball.
-The way we do this is quite peculiar, so listen up :)
+- gcj-x.y build-depends on gcc-x.y-source and C++ and Java compilers.
+ Its .orig.tar.bz2 file only contains an empty directory; the real
+ sources from which it builds the binary packages are in
+ gcc-x.y-source.
-When we build from the gcc-4.3 source package, we produce, among many
-others, a gcc-4.3-source binary package that contains the pristine
-upstream tarball and some Debian-specific patches. Any user can then
-install this package on their Debian system, and will have the full
-souces in /usr/src/gcc-4.3/gcc-<timestamp>.tar.bz2, along with the
-Makefile snippets that unpack and patch them.
+- gnat-x.y build-depends on gcc-x.y-source and an Ada compiler. It
+ does not even have an .orig.tar.bz2 package; it is a Debian native
+ package.
-The intended use for this package is twofold: (a) allow users to build
-their own cross-compilers, and (b) build the other two packages,
-gcj-4.3 and gnat-4.3.
+The benefits of this split are many:
-For gcj-4.3 and gnat-4.3, the "source tarball" just contains an empty
-directory; e.g.:
+- bootstrapping a subset of languages is much faster than
+ bootstrapping all languages and libraries (which can take a full
+ week on slow architectures like mips or arm)
-$ tar tzf gnat-4.3_4.3-20070609.orig.tar.gz
-gnat-4.3-4.3-20070609.orig/
+- the language maintainers don't have to wait for each other
-The build scripts for all source packages are the same, and they are
-included, as usual, in the .diff.gz file.
+- for new ports, the absence of a port of, say, gnat-x.y does not
+ block the porting of gcc-x.y.
+
+gcc-x.y-source is also intended for interested users to build
+cross-compiler packages. Debian cannot provide all possible
+cross-compiler packages (i.e. all possible host, target, language and
+library combinations), so instead tries to facilitate building them.
* The build sequence
@@ -53,67 +54,66 @@ gcj-4.3 (4.3-20070609-1) unstable; urgency=low
then, debian/rules will build only the Java binary packages.
-The second step is to unpack the GCC source tarball. This tarball is
-either in the build directory (when building gcc-4.3), or in
-/usr/src/gcc-4.3/gcc-<timestamp>.tar.bz2 (when building the other
-source packages).
-
-The third step is to build debian/control from debian/control.m4 and a
-complex set of rules specified in debian/rules.conf. The resulting
+The second step is to build debian/control from debian/control.m4 and
+a complex set of rules specified in debian/rules.conf. The resulting
control file contains only the binary packages to be built.
-The fourth step is to select which patches to apply (this is done in
+The third step is to select which patches to apply (this is done in
debian/rules.defs), and then to apply the selected patches (see
-debian/rules.patch).
+debian/rules.patch). The result of this step is a generated
+debian/patches/series file for use by quilt.
+
+The fourth step is to unpack the GCC source tarball. This tarball is
+either in the build directory (when building gcc-x.y), or in
+/usr/src/gcc-x.y/gcc-x.y.z.tar.xz (when building the other source
+packages).
-The fifth step is to create a "build" directory, cd into it, call
+The fifth step is to apply all patches to the unpacked sources with
+quilt.
+
+The sixth step is to create a "build" directory, cd into it, call
../src/configure, and bootstrap the compiler and libraries selected.
This is in debian/rules2.
-The sixth step is to call "make install" in the build directory: this
-installs the compiler and libraries into debian/tmp
+The seventh step is to call "make install" in the build directory:
+this installs the compiler and libraries into debian/tmp
(i.e. debian/tmp/usr/bin/gcc, etc.)
-The seventh step is to run the GCC test suite (this actually takes at
+The eighth step is to run the GCC test suite. This actually takes at
least as much time as bootstrapping, and you can disable it by setting
-WITHOUT_CHECK to "yes" in the environment).
+WITHOUT_CHECK to "yes" in the environment.
-The eighth step is to build the binary packages, i.e. the .debs. This
+The ninth step is to build the binary packages, i.e. the .debs. This
is done by a set of language- and architecture-dependent Makefile
snippets in the debian/rules.d/ directory, which move files from the
debian/tmp tree to the debian/<package> trees.
* Making your own packages
-In this example, we will build our own gnat-4.3 package.
-
-1) Create a .orig.tar.gz tarball containing a single, empty directory.
-
-$ mkdir gnat-4.3-4.3-20070609.orig
-$ tar czf gnat-4.3_4.3-20070609.orig.tar.gz gnat-4.3-4.3-20070609.orig
+In this example, we will build our own gnat-x.y package.
-2) Install gcc-4.3-source, which contains the real sources:
+1) Install gcc-x.y-source, which contains the real sources:
-# apt-get install gcc-4.3-source
+# aptitude install gcc-x.y-source
-3) Create a build directory:
+2) Create a build directory:
-$ mkdir gnat-4.3-4.3-20070609; cd gnat-4.3-4.3-20070609
+$ mkdir gnat-x.y-x.y.z; cd gnat-x.y-x.y.z
-4) Checkout from Subversion:
+3) Checkout from Subversion:
-$ svn checkout svn://svn.debian.org/gcccvs/branches/sid/gcc-4.3/debian
+$ svn checkout svn://svn.debian.org/gcccvs/branches/sid/gcc-x.y/debian
-5) Edit the debian/changelog file, adding a new entry at the top that
- starts with "gnat-4.3" instead of "gcc-4.3".
+4) Edit the debian/changelog file, adding a new entry at the top that
+ starts with "gnat-x.y".
-6) Generate the debian/control file, adjusted for gnat:
+5) Generate the debian/control file, adjusted for gnat:
$ debian/rules control
-7) Build:
+8) Build:
-$ dpkg-buildpackage -rfakeroot
+$ dpkg-buildpackage
* Hints
@@ -136,7 +136,7 @@ necessary to hold the files in it; deleting files frees up RAM.
2) As your regular user, create the working directory in the tmpfs
-$ cp --archive ~/src/debian/gcc-4.3-4.3-20070901 ~/src/debian/ram
+$ cp --archive ~/src/debian/gcc-x.y-x.y.z ~/src/debian/ram
3) Build in there. On my dual-core, 2 GHz amd64, it takes 34 minutes
to build gnat, and the tmpfs takes 992 MiB of physical RAM but
@@ -159,79 +159,18 @@ to the build process, or do not use a tmpfs to build.
* Patching GCC
Debian applies a large number of patches to GCC as part of the build
-process. The patches are shell scripts located in debian/patches.
-The file debian/rules.defs selects the language front-ends and
-libraries to build. Then, based on that, debian/rules.patch selects
-which patches to apply and in which order, then applies them and
-produces a file listing the applied patches in order in
-stamps/02-patch-stamp.
-
-There is currently no tool to help modify patches; you have to do it
-by hand. Here is one possible way to do it:
-
-1) Apply all patches up to and EXCLUDING the patch you intend to
- modify, in order.
-
-2) Make a deep copy of the src directory, e.g.
- $ cp --archive src src.bak
-
-3) Apply the patch you intend to modify.
-
-4) Open the .dpatch file in your editor and remove the entire patch
- section; leave alone the shell script part at the top.
-
-5) Change the files you want in the src directory. After making
- changes, you can experiment with
- $ make -C build -jK
- (where K is the number of processor threads you have)
+process. It uses quilt but the necessary debian/patches/series is not
+part of the packaging scripts; instead, "debian/rules patch" generates
+this file by looking at debian/control (which is itself generated!),
+debian/changelog and other files. Then it applies all the patches.
+At this point, you can use quilt as usual:
-6) $ diff -rNu src.bak src >> debian/patches/<file>.dpatch
-
-7) Apply all remaining patches, to see if your change broke any of
- them.
-
-8) $ svn commit debian/patches/<file>.dpatch
-
-If you want to add a new patch, the procedure is similar. You must
-first choose where in the list of patches you want to insert your new
-patch. Then, apply all patches up to that point and start editing.
-Do not forget to add a reference to your patch at the proper place in
-debian/rules.patch.
-
-** Patching GCC with Quilt
-
-The above method uses an entire copy of the source tree, which is
-currently 474 megabytes in size. If you are in a one-gigabyte ram
-disk (see Hints above), this may be a problem. One solution to this
-problem is to use quilt, which will only keep copies of the files
-touched by patches, not all files. It also automates the updating of
-a patch after you change the sources.
-
-Quilt however does not take into account the selection of patches made
-in debian/rules.defs; instead it has a static list of patches. After
-calling "debian/rules patch", you can generate such a list like this:
-
-$ egrep '^[^ ]+:' stamps/02-patch-stamp | \
- sed 's!:!.dpatch -p0!' > debian/patches/series
-
-Unfortunately, not all patches are applied with -p0; you must then
-edit debian/patches/series by hand to replace -p0 with -p1 for a few
-patches.
-
-Once you have your debian/patches/series:
-
-$ debian/rules unpatch
+$ cd ~/src/debian/gcc-x.y
$ export QUILT_PATCHES=$PWD/debian/patches
-$ cd src
-$ quilt push -a (or quilt push <patch_name>)
-edit files at will; quilt add <file_name> to add a new file to the patch
-$ make -C ../build
-$ quilt refresh
-$ quilt push -a # check that no patch is broken
-$ quilt pop -a
-$ cd ..
-$ debian/rules clean build
-$ svn commit
+$ quilt series
+
+If you add new patches, remember to add them to the version control
+system too.
--
-Ludovic Brenta, 2007-12-05.
+Ludovic Brenta, 2012-04-02.
diff --git a/debian/changelog b/debian/changelog
index 711fd3d..f1e89de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnat-4.6 (4.6.4-0.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Merge remaining changes from src:gnat-4.6 (only in
+ debian/patches/ada-symbolic-tracebacks.diff and
+ debian/README.maintainers) and its changelog entries
+ on top of src:gcc-4.6
+ * Reupload as gnat-4.6 (Closes: #707261)
+
+ -- Thorsten Glaser <tg@mirbsd.de> Thu, 09 May 2013 23:57:42 +0000
+
gcc-4.6 (4.6.4-2) unstable; urgency=low
* Refresh ada-sjlj.diff.
@@ -164,6 +175,36 @@ gcc-4.6 (4.6.3-10) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Tue, 18 Sep 2012 22:40:18 +0200
+gnat-4.6 (4.6.3-8) unstable; urgency=low
+
+ [Steven Chamberlain]
+ * debian/patches/gcc-gengtype-fix[12].diff: new; backport a fix for a
+ memory leak from the trunk.
+
+ -- Ludovic Brenta <lbrenta@debian.org> Tue, 9 Oct 2012 09:10:43 +0200
+
+gnat-4.6 (4.6.3-7) unstable; urgency=low
+
+ [Christoph Egger]
+ * debian/patches/ada-symbolic-tracebacks.diff (src/gcc/ada/tracebak.c):
+ s/__kFreeBSD_kernel__/__FreeBSD_kernel__/. Closes: #685559.
+
+ -- Ludovic Brenta <lbrenta@debian.org> Sat, 29 Sep 2012 21:53:25 +0200
+
+gnat-4.6 (4.6.3-6) unstable; urgency=low
+
+ [Svante Signell]
+ * debian/patches/ada-symbolic-tracebacks.diff (src/gcc/ada/tracebak.c):
+ Use the GCC stack unwinder on GNU/kFreeBSD too. Closes: #685559.
+ * debian/patches/gcc_ada_gcc-interface_Makefile.in.diff: link
+ libgnarl.so.4.6 with librt on GNU/Hurd. Closes: #685561.
+ * debian/patches/ada-kfreebsd-gnu.diff: likewise on GNU/kFreeBSD.
+ Closes: #685562.
+
+ Merge from gcc-4.6 (4.6.3-9) unstable; urgency=medium
+
+ -- Ludovic Brenta <lbrenta@debian.org> Wed, 22 Aug 2012 01:16:33 +0200
+
gcc-4.6 (4.6.3-9) unstable; urgency=medium
* Update to SVN 20120820 (r190530) from the gcc-4_6-branch.
@@ -187,6 +228,16 @@ gcc-4.6 (4.6.3-9) unstable; urgency=medium
-- Matthias Klose <doko@debian.org> Mon, 20 Aug 2012 13:13:45 +0200
+gnat-4.6 (4.6.3-5) unstable; urgency=low
+
+ [Svante Signell]
+ * debian/patches/ada-symbolic-tracebacks.diff (src/gcc/ada/tracebak.c):
+ new hunk. Use the GCC stack unwinder on GNU/Hurd. Closes: #681998.
+
+ Merge from gcc-4.6 (4.6.3-8) unstable; urgency=low
+
+ -- Ludovic Brenta <lbrenta@debian.org> Wed, 18 Jul 2012 22:41:12 +0200
+
gcc-4.6 (4.6.3-8) unstable; urgency=low
* Update to SVN 20120624 (r188916) from the gcc-4_6-branch.
@@ -218,6 +269,15 @@ gcc-4.6 (4.6.3-6) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Tue, 22 May 2012 13:24:37 +0800
+gnat-4.6 (4.6.3-4) unstable; urgency=low
+
+ * debian/patches/ada-link-lib.diff: do not use parallel makes to build
+ the GNAT tools. Closes: #667184.
+
+ Merge from gcc-4.6 (4.6.3-5) unstable; urgency=medium
+
+ -- Ludovic Brenta <lbrenta@debian.org> Thu, 10 May 2012 08:42:44 +0200
+
gcc-4.6 (4.6.3-5) unstable; urgency=medium
* Update to SVN 20120430 (r186999) from the gcc-4_6-branch.
@@ -229,6 +289,14 @@ gcc-4.6 (4.6.3-5) unstable; urgency=medium
-- Matthias Klose <doko@debian.org> Tue, 01 May 2012 18:43:22 +0200
+gnat-4.6 (4.6.3-3) unstable; urgency=low
+
+ * debian/README.maintainers, debian/README.gnat: update.
+
+ Merge from gcc-4.6 (4.6.3-4) unstable; urgency=low
+
+ -- Ludovic Brenta <lbrenta@debian.org> Thu, 19 Apr 2012 00:00:56 +0200
+
gcc-4.6 (4.6.3-4) unstable; urgency=low
[ Matthias Klose ]
@@ -305,6 +373,30 @@ gcc-4.6 (4.6.3-2) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Wed, 04 Apr 2012 00:10:02 +0200
+gnat-4.6 (4.6.3-2) unstable; urgency=low
+
+ [ Thorsten Glaser ]
+ * Actually apply the libffi-m68k patch; update it from upstream
+ * Apply further m68k platform bugfixes (pr47955, m68k-fp-cmp-zero)
+ * Revert pr45144 fix on m68k only, it results in miscompilation
+ * Apply initial m68k-ada support patch; enable Ada for m68k
+
+ [Ludovic Brenta]
+ * debian/patches/ada-libgnatprj.diff: add support for m68k-*-linux.
+
+ -- Ludovic Brenta <lbrenta@debian.org> Sat, 10 Mar 2012 20:04:23 +0100
+
+gnat-4.6 (4.6.3-1) unstable; urgency=low
+
+ * debian/control.m4: remove dependencies on ada-compiler which is being
+ phased out.
+ * debian/patches/ada-libgnatvsn.diff (gnatvsn.ads): new hunk, revert an
+ upstream change to Current_Year to preserve the aliversion.
+
+ Merge from gcc-4.6 (4.6.3-1) unstable; urgency=low
+
+ -- Ludovic Brenta <lbrenta@debian.org> Sun, 4 Mar 2012 15:47:42 +0100
+
gcc-4.6 (4.6.3-1) unstable; urgency=low
* GCC 4.6.3 release.
@@ -482,6 +574,12 @@ gcc-4.6 (4.6.2-8) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Fri, 16 Dec 2011 16:59:30 +0100
+gnat-4.6 (4.6.2-3) unstable; urgency=low
+
+ Merge from gcc-4.6 (4.6.2-7) unstable; urgency=medium
+
+ -- Ludovic Brenta <lbrenta@debian.org> Sun, 11 Dec 2011 02:19:52 +0100
+
gcc-4.6 (4.6.2-7) unstable; urgency=medium
* Update to SVN 20111210 (r182189) from the gcc-4_6-branch.
@@ -519,6 +617,16 @@ gcc-4.6 (4.6.2-6) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Thu, 08 Dec 2011 17:14:35 +0100
+gnat-4.6 (4.6.2-2) unstable; urgency=low
+
+ [Євгеній Мещеряков]
+ * debian/patches/pr47818.diff: new. Closes: #614402.
+ * debian/rules.patch: apply it.
+
+ Merge from gcc-4.6 (4.6.2-5) unstable; urgency=low
+
+ -- Ludovic Brenta <lbrenta@debian.org> Sun, 13 Nov 2011 10:32:28 +0100
+
gcc-4.6 (4.6.2-5) unstable; urgency=low
* Update to SVN 20111121 (r181596) from the gcc-4_6-branch.
@@ -552,6 +660,20 @@ gcc-4.6 (4.6.2-4) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Thu, 03 Nov 2011 12:03:41 -0400
+gnat-4.6 (4.6.2-1) unstable; urgency=low
+
+ [Ludovic Brenta]
+ * Suggest ada-reference-manual-{html,info,pdf,text} instead of just
+ ada-reference-manual which no longer exists.
+ * Do not suggest gnat-gdb, superseded by gdb.
+ * Downgrade libgnat{vsn,prj}4.6-dev to priority extra; they conflict
+ with their 4.4 counterparts and priority optional packages may not
+ conflict with one another, per Policy 2.5.
+
+ Merge from gcc-4.6 (4.6.2-3) unstable; urgency=low
+
+ -- Ludovic Brenta <lbrenta@debian.org> Thu, 27 Oct 2011 21:55:35 +0200
+
gcc-4.6 (4.6.2-3) unstable; urgency=low
* disable parallel builds on kfreebsd-* even if DEB_BUILD_OPTIONS
@@ -651,6 +773,21 @@ gcc-4.6 (4.6.1-14) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Sat, 08 Oct 2011 14:40:49 +0200
+gnat-4.6 (4.6.1-6) unstable; urgency=low
+
+ [Xavier Grave]
+ * debian/patches/address-clauses-timed-entry-calls.diff: new; backport
+ bug fix about address clauses and timed entry calls.
+
+ [Ludovic Brenta]
+ * debian/patches/ada-kfreebsd-gnu.diff: new; provide dummy
+ implementations of some optional POSIX Threads functions missing in
+ GNU/kFreeBSD. Closes: #642128.
+
+ Merge from gcc-4.6 (4.6.1-13) unstable; urgency=low
+
+ -- Ludovic Brenta <lbrenta@debian.org> Sun, 25 Sep 2011 22:38:08 +0200
+
gcc-4.6 (4.6.1-13) unstable; urgency=low
* Update to SVN 20110926 (r179207) from the gcc-4_6-branch.
@@ -713,6 +850,12 @@ gcc-4.6 (4.6.1-9) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Sat, 03 Sep 2011 20:11:50 +0200
+gnat-4.6 (4.6.1-5) unstable; urgency=low
+
+ Merge from gcc-4.6 (4.6.1-8) unstable; urgency=low
+
+ -- Ludovic Brenta <lbrenta@debian.org> Thu, 25 Aug 2011 19:23:09 +0200
+
gcc-4.6 (4.6.1-8) unstable; urgency=low
* Update to SVN 20110824 (r178027) from the gcc-4_6-branch.
@@ -824,6 +967,30 @@ gcc-4.6 (4.6.1-5) unstable; urgency=low
-- Matthias Klose <doko@debian.org> Sat, 23 Jul 2011 08:15:50 +0200
+gnat-4.6 (4.6.1-2) unstable; urgency=low
+
+ [Aurelien Jarno]
+ * debian/patches/ada-mips.diff: work around a bootstrap comparison
+ failure on mips and mipsel. Closes: #634881, pending a proper fix.
+
+ [Ludovic Brenta]
+ * debian/patches/pr49819.diff: new. Closes: #635112.
+
+ Merge from gcc-4.6 (4.6.1-4) unstable; urgency=low
+
+ [ Matthias Klose ]
+ * Do not install the spu and hppa64 cross compilers into the multiarch path.
+ * Update the Linaro support to 20110704.
+
+ [ Thorsten Glaser ]
+ * Apply changes from src:gcc-4.4 for m68k support. Fixes: #632380.
+ - debian/rules.defs: Remove m68k from locale_no_cpus.
+ - debian/patches/gcc-multiarch.diff: Add m68k multiarch_mappings.
+ - debian/patches/pr43804.diff: Fix backported from SVN.
+ - debian/rules.patch: Add pr43804.
+
+ -- Ludovic Brenta <lbrenta@debian.org> Sat, 23 Jul 2011 01:32:15 +0200
+
gcc-4.6 (4.6.1-4) unstable; urgency=low
* Update to SVN 20110714 (r176280) from the gcc-4_6-branch.
@@ -1224,9 +1391,9 @@ gcc-4.6 (4.6.0~rc1-1) experimental; urgency=low
* Update GFDL compliant builds. Closes: #609161.
* For GFDL compliant builds, build a dummy s-tm-texi without access
to the texinfo sources.
-
+
[ Aurelien Jarno ]
- * Import symbol files for kfreebsd-amd64, kfreebsd-i386, sh4 and
+ * Import symbol files for kfreebsd-amd64, kfreebsd-i386, sh4 and
sparc64 from gcc-4.5.
-- Matthias Klose <doko@debian.org> Mon, 14 Mar 2011 19:01:08 +0100
@@ -1393,7 +1560,7 @@ gcc-4.5 (4.5.2-6) unstable; urgency=low
us use a common set of paths on both Debian and Ubuntu, regardless of
the target default optimization level.
* debian/rules.conf: when building for multiarch, we need to be sure we
- are building against a libc-dev that supports the corresponding paths.
+ are building against a libc-dev that supports the corresponding paths.
(the referenced version number for this needs to be bumped once this is
officially in the archive.)
@@ -1886,7 +2053,7 @@ gcc-4.5 (4.5.0-6) experimental; urgency=low
* Update libgcc and libstdc++ symbols files.
[ Aurelien Jarno ]
-
+
* libstdc++-mips-ldbl-compat.diff: On MIPS provide the long double
versions of "C" math functions in libstdc++ as we need to keep the
ABI. Closes: #584610.
@@ -2110,7 +2277,7 @@ gcc-4.5 (4.5-20100106-0ubuntu1) lucid; urgency=low
* Rename libgcc symbols file for hppa.
* On alpha and armel, set BOOT_CFLAGS to -g -O1 to work around bootstrap
failures (see PR target/42509 (armel) and PR bootstrap/42511 (alpha)).
- * Base the source build-dependency on the package version instead of the
+ * Base the source build-dependency on the package version instead of the
gcc version.
-- Matthias Klose <doko@ubuntu.com> Wed, 06 Jan 2010 14:17:29 +0100
@@ -2123,7 +2290,7 @@ gcc-4.5 (4.5-20100103-1) experimental; urgency=low
* Update hurd patch for 4.5. Closes: #562802.
[ Aurelien Jarno ]
- * Remove patches/kbsd-gnu-ada.diff (merged upstream).
+ * Remove patches/kbsd-gnu-ada.diff (merged upstream).
[ Matthias Klose ]
* libgcj11: Move .so symlinks into gcj-4.5-jdk. Addresses: #563280.
@@ -2337,7 +2504,7 @@ gcc-4.4 (4.4.1-6) unstable; urgency=low
gcc-4.4 (4.4.1-5) unstable; urgency=medium
* Update to SVN 20091003 from the gcc-4_4-branch (r152174).
- - Fixes PR target/22093, PR c/39779, PR libffi/40242, PR target/40473,
+ - Fixes PR target/22093, PR c/39779, PR libffi/40242, PR target/40473,
PR debug/40521, PR c/41049, PR debug/41065, PR ada/41100,
PR tree-optimization/41101, PR libgfortran/41328, PR libffi/41443,
PR fortran/41515.
@@ -2626,7 +2793,7 @@ gcc-4.4 (4.4.0-4) unstable; urgency=medium
* Add ARM EABI symbols to libstdc++ symbol files for armel.
* Add libobjc symbols file for armel.
* Fix PR libstdc++/40038, missing ceill/tanhl symbols in libstdc++.
-
+
[ Aurelien Jarno ]
* Fix libc name for biarch packages on kfreebsd-amd64.
@@ -3329,8 +3496,8 @@ gcc-4.3 (4.3.0-5) unstable; urgency=medium
- On Debian amd64 and i386 configure with --enable-cld.
* Fix PR tree-optimization/36129, ICE with -fprofile-use.
* Add spu build dependencies independent of the architecture.
- * Move arm -funroll-loops fix to arm-funroll-loops from
- gfortran-armel-updates. Apply it on both arm and armel.
+ * Move arm -funroll-loops fix to arm-funroll-loops from
+ gfortran-armel-updates. Apply it on both arm and armel.
Closes: #476460.
* Use iceape-dev as a build dependency for Java enabled builds.
* Build the sru cross compiler from a separate source dir without applying
@@ -3341,7 +3508,7 @@ gcc-4.3 (4.3.0-5) unstable; urgency=medium
gcc-4.3 (4.3.0-4) unstable; urgency=low
[ Aurelien Jarno ]
- * Fix gnat-4.3 build on mips/mipsel.
+ * Fix gnat-4.3 build on mips/mipsel.
* Update libgcc1 symbols for hurd-i386.
[ Arthur Loiret ]
@@ -3435,7 +3602,7 @@ gcc-4.3 (4.3.0-3) unstable; urgency=medium
[ Aurelien Jarno ]
* Fix gobjc-4.3-multilib dependencies. Closes: #473455.
- * Fix gnat-4.3 build on mips/mipsel.
+ * Fix gnat-4.3 build on mips/mipsel.
* patches/ada-alpha.dpatch: new patch to fix gnat-4.3 build on alpha.
Closes: #472852.
* patches/config-ml.dpatch: also check for n32 multidir.
@@ -3597,7 +3764,7 @@ gcc-4.3 (4.3-20080127-1) unstable; urgency=low
* Tighten build dependency on doxygen.
* Update libstdc++ patches to current svn.
* gij-4.3: Provide java*-runtime-headless instead of java*-runtime.
-
+
[ Aurelien Jarno]
* debian/multiarch.inc: change mipsel64 into mips64el.
@@ -3981,7 +4148,7 @@ gcc-4.2 (4.2.1-2) unstable; urgency=low
* Fix build on kfreebsd-amd64 (Aurelien Jarno). Closes: #435053.
* Period of grace is over, run the testsuite on m68k-linux again.
* Update infrastructure for the gcc-source package (Bastian Blank).
- * Update profiling on the Hurd (Samuel Thibault, Michael Casadevall).
+ * Update profiling on the Hurd (Samuel Thibault, Michael Casadevall).
Closes: #433539.
* debian/rules2: Allow DEB_BUILD_OPTIONS=parallel=<n> to overwrite NJOBS.
* Allow lang=<l1>,<l2> nolang=<l3,l4> in DEB_BUILD_OPTIONS; deprecating
@@ -4027,7 +4194,7 @@ gcc-4.2 (4.2.1-1) unstable; urgency=medium
- Fix mips/mipsel builds.
* libmudflap0: Fix update leaving an empty doc dir. Closes: #428306.
* arm/armel doesn't have ssp support. Closes: #433172.
- * Update kbsd-gnu-ada patch (Aurelien Jarno): Addresses: #434754.
+ * Update kbsd-gnu-ada patch (Aurelien Jarno): Addresses: #434754.
* gcj-4.2: Build depend on gcj-4.2 to build the classpath examples files
for the binary-indep target.
* Fix PR java/32862, bugs in EnumMap implementation. Addresses: #423160.
@@ -4167,7 +4334,7 @@ gcc-4.2 (4.2-20070525-1) unstable; urgency=low
* Do not explicitely configure for __cxa_atexit.
* libstdc++6-4.2-doc: Conflict with libstdc++6-4.1-doc. Closes: #424896.
* Update m68k patches:
- - Remove patches applied upstream: m68k-jumptable, m68k-gc,
+ - Remove patches applied upstream: m68k-jumptable, m68k-gc,
- Reenable patches: m68k-save_pic, m68k-dwarf, m68k-limit_reload,
m68k-prevent-qipush, m68k-peephole, m68k-return, m68k-sig-unwind,
m68k-align-code m68k-align-stack, m68k-symbolic-operand,
@@ -4305,7 +4472,7 @@ gcc-4.2 (4.2-20060905-1) experimental; urgency=low
gcc-4.2 (4.2-20060818-1) experimental; urgency=low
* Update to SVN 20060818.
- - libjava-libgcjbc.dpatch: Remove, applied upstream.
+ - libjava-libgcjbc.dpatch: Remove, applied upstream.
* Merge changes from the Ubuntu gcj-4.2 package:
- libjava-soname.dpatch: Remove, applied upstream.
- libjava-native-libdir.dpatch: update.
@@ -4769,7 +4936,7 @@ gcc-4.1 (4.1.1ds1-15) unstable; urgency=medium
-- Matthias Klose <doko@debian.org> Fri, 29 Sep 2006 22:32:41 +0200
gcc-4.1 (4.1.1ds1-14) unstable; urgency=medium
-
+
[Matthias Klose]
* Update to SVN 20060920.
- Fix PR c++/26957. Closes: #373257, #386910.
@@ -4783,7 +4950,7 @@ gcc-4.1 (4.1.1ds1-14) unstable; urgency=medium
- When running the i386 binaries on amd64, adjust the properties
java.home, gnu.classpath.home.url, sun.boot.class.path,
gnu.gcj.precompiled.db.path.
- - Configure the 32bit build on amd64
+ - Configure the 32bit build on amd64
--with-java-home=/usr/lib32/jvm/java-1.4.2-gcj-4.1-1.4.2.0/jre.
- Configure --with-long-double-128 for glibc-2.4 on alpha, powerpc, ppc64,
s390, s390x, sparc, sparc64.
@@ -6491,23 +6658,23 @@ gcc-4.0 (4.0-0pre0) experimental; urgency=low
* Robert Millan <rmh@debian.org>
- * control.m4:
- - s/locale_no_archs !hurd-i386/locale_no_archs/g
- (This is now handled in rules.defs. [1])
- - s/procps [check_no_archs]/procps [linux_gnu_archs]/g [2]
- - Add type-handling to build-deps. [3]
- * rules.conf:
- - Don't require (>= $(libc_ver)) for libc0.1-dev. [4]
- - Generate *_no_archs variables with type-handling and use them for
- for m4's -D parameters. [3]
- * rules.defs:
- - use filter instead of findstring [1].
- - s/netbsd-elf-gnu/netbsdelf-gnu/g [5].
- - enable java for kfreebsd-gnu [6]
- - enable ffi for kfreebsd-gnu and knetbsd-gnu [6]
- - enable libgc for kfreebsd-gnu [6]
- - enable checks for kfreebsd-gnu and knetbsd-gnu [7]
- - enable locales for kfreebsd-gnu and gnu [1] [8].
+ * control.m4:
+ - s/locale_no_archs !hurd-i386/locale_no_archs/g
+ (This is now handled in rules.defs. [1])
+ - s/procps [check_no_archs]/procps [linux_gnu_archs]/g [2]
+ - Add type-handling to build-deps. [3]
+ * rules.conf:
+ - Don't require (>= $(libc_ver)) for libc0.1-dev. [4]
+ - Generate *_no_archs variables with type-handling and use them for
+ for m4's -D parameters. [3]
+ * rules.defs:
+ - use filter instead of findstring [1].
+ - s/netbsd-elf-gnu/netbsdelf-gnu/g [5].
+ - enable java for kfreebsd-gnu [6]
+ - enable ffi for kfreebsd-gnu and knetbsd-gnu [6]
+ - enable libgc for kfreebsd-gnu [6]
+ - enable checks for kfreebsd-gnu and knetbsd-gnu [7]
+ - enable locales for kfreebsd-gnu and gnu [1] [8].
* Closes: #264025.
-- Matthias Klose <doko@debian.org> Sun, 12 Sep 2004 12:52:56 +0200
@@ -6592,7 +6759,7 @@ gcc-3.4 (3.4.0-1) experimental; urgency=low
- Use of configure flags affecting binary ABI's not yet determined.
- Several ABI bugs have been fixed. Unfortunately, these changes will break
binary compatibility with earlier releases on several architectures:
- alpha, mips, sparc,
+ alpha, mips, sparc,
- hppa and m68k changed sjlj based exception handling to dwarf2 based
exception handling.
@@ -6866,7 +7033,7 @@ gcc-3.3 (1:3.3.2ds3-0pre5) unstable; urgency=low
(Phil Blundell)
* Update priorities in debian/control to match the archive.
(Ryan Murray)
- * s390-nonlocal-goto patch added. Fixes some pascal testcase failures.
+ * s390-nonlocal-goto patch added. Fixes some pascal testcase failures.
(Gerhard Tonn)
* On alpha-linux, make -mieee default and add -mieee-disable switch
to turn default off (closes: #212912).
diff --git a/debian/control b/debian/control
index 6e00581..c03cb58 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
-Source: gcc-4.6
+Source: gnat-4.6
Section: devel
Priority: optional
Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
-Uploaders: Matthias Klose <doko@debian.org>
+Uploaders: Ludovic Brenta <lbrenta@debian.org>
Standards-Version: 3.9.4
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],
@@ -11,396 +11,197 @@ Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib
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, sharutils,
- procps, binutils-spu (>= 2.21.1) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64],
- libcloog-ppl-dev (>= 0.16), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12), dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen,
+ procps, gnat (>= 4.1), gcc-4.6-source (>= 4.6.4), gcc-4.6-source (<< 4.6.5),
+ libcloog-ppl-dev (>= 0.16), libmpc-dev (>= 1.0), 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-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), gsfonts-x11, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns,
+Build-Depends-Indep:
Build-Conflicts: binutils-gold
Homepage: http://gcc.gnu.org/
XS-Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.6/
XS-Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.6
-Package: gcc-4.6-base
+Package: gnat-4.6-base
Architecture: any
-Multi-Arch: same
Section: libs
-Priority: required
+Priority: optional
Depends: ${misc:Depends}
-Replaces: ${base:Replaces}
-Breaks: gcj-4.6-base (<< 4.6.1-4~), gnat-4.6 (<< 4.6.1-5~), dehydra (<= 0.9.hg20110609-2)
-Description: GCC, the GNU Compiler Collection (base package)
- This package contains files common to all languages and libraries
- contained in the GNU Compiler Collection (GCC).
+Breaks: gcc-4.6 (<< 4.6.1-8~)
+Description: GNU Ada compiler (common files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package contains files common to all GNAT related packages.
-Package: gcc-4.6
+Package: gnat-4.6
Architecture: any
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), cpp-4.6 (= ${gcc:Version}), binutils (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends}
-Recommends: ${dep:libcdev}
-Suggests: ${gcc:multilib}, libmudflap0-4.6-dev (>= ${gcc:Version}), gcc-4.6-doc (>= ${gcc:SoftVersion}), gcc-4.6-locales (>= ${gcc:SoftVersion}), libgcc1-dbg, libgomp1-dbg, libquadmath0-dbg, libmudflap0-dbg, ${dep:libcloog}, ${dep:gold}
-Provides: c-compiler
-Description: GNU C compiler
- This is the GNU C compiler, a fairly portable optimizing compiler for C.
-
-Package: gcc-4.6-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
-Section: devel
Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6 (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: ${dep:libmudflapbiarch}
-Description: GNU C compiler (multilib files)
- This is the GNU C compiler, a fairly portable optimizing compiler for C.
+Pre-Depends: multiarch-support
+Depends: gnat-4.6-base (= ${gnat:Version}), gcc-4.6 (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: gnat-4.6-doc, ada-reference-manual-html, ada-reference-manual-info, ada-reference-manual-pdf, ada-reference-manual-text, gnat-4.6-sjlj
+Provides: ada-compiler
+Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5, gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4
+Description: GNU Ada compiler
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
.
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This package provides the compiler, tools and runtime library that handles
+ exceptions using the default zero-cost mechanism.
-Package: gcc-4.6-plugin-dev
+Package: gnat-4.6-sjlj
Architecture: any
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6 (= ${gcc:Version}), libgmp-dev (>= 2:5.0.1~), ${shlibs:Depends}, ${misc:Depends}
-Description: Files for GNU GCC plugin development.
- This package contains (header) files for GNU GCC plugin development. It
- is only used for the development of GCC plugins, but not needed to run
- plugins.
-
-Package: gcc-4.6-hppa64
-Architecture: hppa
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3)
-Description: GNU C compiler (cross compiler for hppa64)
- This is the GNU C compiler, a fairly portable optimizing compiler for C.
-
-Package: gcc-4.6-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), binutils-spu (>= 2.18.1~cvs20080103-3), newlib-spu, ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-gcc
-Description: SPU cross-compiler (preprocessor and C compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (preprocessor
- and C compiler).
-
-Package: g++-4.6-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-g++
-Description: SPU cross-compiler (C++ compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (C++ compiler).
-
-Package: gfortran-4.6-spu
-Architecture: powerpc ppc64
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6-spu (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: spu-gfortran
-Description: SPU cross-compiler (Fortran compiler)
- GNU Compiler Collection for the Cell Broadband Engine SPU (Fortran compiler).
+Priority: extra
+Pre-Depends: multiarch-support
+Depends: gnat-4.6-base (= ${gnat:Version}), gnat-4.6 (= ${gnat:Version}), ${misc:Depends}
+Description: GNU Ada compiler (setjump/longjump runtime library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides an alternative runtime library that handles
+ exceptions using the setjump/longjump mechanism (as a static library
+ only). You can install it to supplement the normal compiler.
-Package: cpp-4.6
+Package: libgnat-4.6
+Section: libs
Architecture: any
-Section: interpreters
+Multi-Arch: same
+Pre-Depends: multiarch-support
Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: gcc-4.6-locales (>= ${gcc:SoftVersion})
-Replaces: gcc-4.6 (<< 4.6.1-9)
-Description: GNU C preprocessor
- A macro processor that is used automatically by the GNU C compiler
- to transform programs before actual compilation.
+Depends: gnat-4.6-base (= ${gnat:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: runtime for applications compiled with GNAT (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
.
- This package has been separated from gcc for the benefit of those who
- require the preprocessor but not the compiler.
-
-Package: gcc-4.6-locales
-Architecture: all
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (>= ${gcc:SoftVersion}), cpp-4.6 (>= ${gcc:SoftVersion}), ${misc:Depends}
-Recommends: gcc-4.6 (>= ${gcc:SoftVersion})
-Description: GCC, the GNU compiler collection (native language support files)
- Native language support for GCC. Lets GCC speak your language,
- if translations are available.
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
.
- Please do NOT submit bug reports in other languages than "C".
- Always reset your language settings to use the "C" locales.
+ This package contains the runtime shared library.
-Package: g++-4.6
+Package: libgnat-4.6-dbg
+Section: debug
Architecture: any
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6 (= ${gcc:Version}), libstdc++6-4.6-dev (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: c++-compiler, c++abi2-dev
-Suggests: ${gxx:multilib}, gcc-4.6-doc (>= ${gcc:SoftVersion}), libstdc++6-4.6-dbg
-Description: GNU C++ compiler
- This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
-
-Package: g++-4.6-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), g++-4.6 (= ${gcc:Version}), gcc-4.6-multilib (= ${gcc:Version}), ${dep:libcxxbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: ${dep:libcxxbiarchdbg}
-Description: GNU C++ compiler (multilib files)
- This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
+Multi-Arch: same
+Pre-Depends: multiarch-support
+Priority: extra
+Depends: gnat-4.6-base (= ${gnat:Version}), libgnat-4.6 (= ${gnat:Version}), ${misc:Depends}
+Description: runtime for applications compiled with GNAT (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
.
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
-
-Package: libmudflap0-4.6-dev
-Architecture: any
-Section: libdevel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), libmudflap0 (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
-Suggests: ${sug:libmudflapdev}
-Conflicts: libmudflap0-dev
-Description: GCC mudflap support libraries (development files)
- The libmudflap libraries are used by GCC for instrumenting pointer and array
- dereferencing operations.
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
.
- This package contains the headers and the static libraries.
+ This package contains the debugging symbols.
-Package: gobjc++-4.6
+Package: libgnatvsn4.6-dev
+Section: libdevel
Architecture: any
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gobjc-4.6 (= ${gcc:Version}), g++-4.6 (= ${gcc:Version}), ${shlibs:Depends}, libobjc3 (>= ${gcc:Version}), ${misc:Depends}
-Suggests: ${gobjcxx:multilib}, gcc-4.6-doc (>= ${gcc:SoftVersion})
-Provides: objc++-compiler
-Description: GNU Objective-C++ compiler
- This is the GNU Objective-C++ compiler, which compiles
- Objective-C++ on platforms supported by the gcc compiler. It uses the
- gcc backend to generate optimized code.
-
-Package: gobjc++-4.6-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gobjc++-4.6 (= ${gcc:Version}), g++-4.6-multilib (= ${gcc:Version}), gobjc-4.6-multilib (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: GNU Objective-C++ compiler (multilib files)
- This is the GNU Objective-C++ compiler, which compiles Objective-C++ on
- platforms supported by the gcc compiler.
+Priority: extra
+Depends: gnat-4.6-base (= ${gnat:Version}), gnat-4.6 (= ${gnat:Version}),
+ libgnatvsn4.6 (= ${gnat:Version}), ${misc:Depends}
+Conflicts: libgnatvsn-dev (<< 4.6), libgnatvsn4.1-dev, libgnatvsn4.3-dev, libgnatvsn4.4-dev, libgnatvsn4.5-dev
+Description: GNU Ada compiler selected components (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
.
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
-
-Package: gobjc-4.6
-Architecture: any
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6 (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc3 (>= ${gcc:Version}), ${misc:Depends}
-Suggests: ${gobjc:multilib}, gcc-4.6-doc (>= ${gcc:SoftVersion}), libobjc3-dbg
-Provides: objc-compiler
-Description: GNU Objective-C compiler
- This is the GNU Objective-C compiler, which compiles
- Objective-C on platforms supported by the gcc compiler. It uses the
- gcc backend to generate optimized code.
-
-Package: gobjc-4.6-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gobjc-4.6 (= ${gcc:Version}), gcc-4.6-multilib (= ${gcc:Version}), ${dep:libobjcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GNU Objective-C compiler (multilib files)
- This is the GNU Objective-C compiler, which compiles Objective-C on platforms
- supported by the gcc compiler.
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
.
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This package contains the development files and static library.
-Package: libobjc3
-Section: libs
+Package: libgnatvsn4.6
Architecture: any
Multi-Arch: same
Pre-Depends: multiarch-support
-Provides: libobjc3-armel [armel], libobjc3-armhf [armhf]
Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications
- Library needed for GNU ObjC applications linked against the shared library.
+Section: libs
+Depends: gnat-4.6-base (= ${gnat:Version}), libgnat-4.6 (= ${gnat:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the runtime shared library.
-Package: libobjc3-dbg
-Section: debug
+Package: libgnatvsn4.6-dbg
Architecture: any
Multi-Arch: same
-Provides: libobjc3-dbg-armel [armel], libobjc3-dbg-armhf [armhf]
-Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), libobjc3 (= ${gcc:Version}), libgcc1-dbg, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications (debug symbols)
- Library needed for GNU ObjC applications linked against the shared library.
-
-Package: lib64objc3
-Section: libs
-Architecture: i386 powerpc sparc s390 mips mipsel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications (64bit)
- Library needed for GNU ObjC applications linked against the shared library.
-
-Package: lib64objc3-dbg
-Section: debug
-Architecture: i386 powerpc sparc s390 mips mipsel
-Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), lib64objc3 (= ${gcc:Version}), lib64gcc1-dbg, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications (64 bit debug symbols)
- Library needed for GNU ObjC applications linked against the shared library.
-
-Package: lib32objc3
-Section: libs
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ${confl:lib32}
-Description: Runtime library for GNU Objective-C applications (32bit)
- Library needed for GNU ObjC applications linked against the shared library.
-
-Package: lib32objc3-dbg
-Section: debug
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x
+Pre-Depends: multiarch-support
Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), lib32objc3 (= ${gcc:Version}), lib32gcc1-dbg, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications (32 bit debug symbols)
- Library needed for GNU ObjC applications linked against the shared library.
-
-Package: libn32objc3
-Section: libs
-Architecture: mips mipsel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications (n32)
- Library needed for GNU ObjC applications linked against the shared library.
-
-Package: libn32objc3-dbg
Section: debug
-Architecture: mips mipsel
-Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), libn32objc3 (= ${gcc:Version}), libn32gcc1-dbg, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications (n32 debug symbols)
- Library needed for GNU ObjC applications linked against the shared library.
+Depends: gnat-4.6-base (= ${gnat:Version}), libgnatvsn4.6 (= ${gnat:Version}), ${misc:Depends}
+Suggests: gnat
+Description: GNU Ada compiler selected components (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the debugging symbols.
-Package: gfortran-4.6
+Package: libgnatprj4.6-dev
+Section: libdevel
Architecture: any
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6 (= ${gcc:Version}), libgfortran3 (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
-Provides: fortran95-compiler
-Suggests: ${gfortran:multilib}, gfortran-4.6-doc, libgfortran3-dbg
-Replaces: libgfortran3-dev
-Description: GNU Fortran compiler
- This is the GNU Fortran compiler, which compiles
- Fortran on platforms supported by the gcc compiler. It uses the
- gcc backend to generate optimized code.
-
-Package: gfortran-4.6-multilib
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
-Section: devel
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gfortran-4.6 (= ${gcc:Version}), gcc-4.6-multilib (= ${gcc:Version}), ${dep:libgfortranbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GNU Fortran compiler (multilib files)
- This is the GNU Fortran compiler, which compiles Fortran on platforms
- supported by the gcc compiler.
+Priority: extra
+Depends: gnat-4.6-base (= ${gnat:Version}), gnat-4.6 (= ${gnat:Version}),
+ libgnatprj4.6 (= ${gnat:Version}), libgnatvsn4.6-dev (= ${gnat:Version}), ${misc:Depends}
+Conflicts: libgnatprj-dev (<< 4.6), libgnatprj4.1-dev, libgnatprj4.3-dev, libgnatprj4.4-dev, libgnatprj4.5-dev
+Description: GNU Ada compiler Project Manager (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
.
- On architectures with multilib support, the package contains files
- and dependencies for the non-default multilib architecture(s).
+ This package contains the development files and static library.
-Package: libstdc++6-4.6-dev
+Package: libgnatprj4.6
Architecture: any
-Section: libdevel
+Multi-Arch: same
+Pre-Depends: multiarch-support
Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), g++-4.6 (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends}
-Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev
-Suggests: libstdc++6-4.6-doc
-Provides: libstdc++-dev
-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++.
+Section: libs
+Depends: gnat-4.6-base (= ${gnat:Version}), libgnat-4.6 (= ${gnat:Version}), libgnatvsn4.6 (= ${gnat:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
.
- 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: libstdc++6-4.6-pic
-Architecture: any
-Section: libdevel
-Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libstdc++6-4.6-dev (= ${gcc:Version}), ${misc:Depends}
-Description: GNU Standard C++ Library v3 (shared library subset kit)
- This is used to develop subsets of the libstdc++ shared libraries for
- use on custom installation floppies and in embedded systems.
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
.
- Unless you are making one of those, you will not need this package.
+ This package contains the runtime shared library.
-Package: libstdc++6-4.6-dbg
+Package: libgnatprj4.6-dbg
Architecture: any
-Section: debug
-Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libgcc1-dbg, ${shlibs:Depends}, ${misc:Depends}
Multi-Arch: same
-Provides: libstdc++6-4.6-dbg-armel [armel], libstdc++6-4.6-dbg-armhf [armhf]
-Recommends: libstdc++6-4.6-dev (= ${gcc:Version})
-Conflicts: libstdc++5-dbg, libstdc++5-3.3-dbg, libstdc++6-dbg, libstdc++6-4.0-dbg, libstdc++6-4.1-dbg, libstdc++6-4.2-dbg, libstdc++6-4.3-dbg, libstdc++6-4.4-dbg, libstdc++6-4.5-dbg
-Description: GNU Standard C++ Library v3 (debugging files)
- This package contains the shared library of libstdc++ compiled with
- debugging symbols.
-
-Package: lib32stdc++6-4.6-dbg
-Architecture: amd64 ppc64 kfreebsd-amd64 s390x
-Section: debug
-Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), lib32stdc++6 (>= ${gcc:Version}), libstdc++6-4.6-dev (= ${gcc:Version}), lib32gcc1-dbg, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: lib32stdc++6-dbg, lib32stdc++6-4.0-dbg, lib32stdc++6-4.1-dbg, lib32stdc++6-4.2-dbg, lib32stdc++6-4.3-dbg, lib32stdc++6-4.4-dbg, lib32stdc++6-4.5-dbg
-Description: GNU Standard C++ Library v3 (debugging files)
- This package contains the shared library of libstdc++ compiled with
- debugging symbols.
-
-Package: lib64stdc++6-4.6-dbg
-Architecture: i386 powerpc sparc s390 mips mipsel
-Section: debug
+Pre-Depends: multiarch-support
Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), lib64stdc++6 (>= ${gcc:Version}), libstdc++6-4.6-dev (= ${gcc:Version}), lib64gcc1-dbg, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: lib64stdc++6-dbg, lib64stdc++6-4.0-dbg, lib64stdc++6-4.1-dbg, lib64stdc++6-4.2-dbg, lib64stdc++6-4.3-dbg, lib64stdc++6-4.4-dbg, lib64stdc++6-4.5-dbg
-Description: GNU Standard C++ Library v3 (debugging files)
- This package contains the shared library of libstdc++ compiled with
- debugging symbols.
-
-Package: libn32stdc++6-4.6-dbg
-Architecture: mips mipsel
Section: debug
-Priority: extra
-Depends: gcc-4.6-base (= ${gcc:Version}), libn32stdc++6 (>= ${gcc:Version}), libstdc++6-4.6-dev (= ${gcc:Version}), libn32gcc1-dbg, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libn32stdc++6-dbg, libn32stdc++6-4.0-dbg, libn32stdc++6-4.1-dbg, libn32stdc++6-4.2-dbg, libn32stdc++6-4.3-dbg, libn32stdc++6-4.4-dbg, libn32stdc++6-4.5-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.6-doc
-Architecture: all
-Section: doc
-Priority: optional
-Depends: gcc-4.6-base (>= ${gcc:SoftVersion}), ${misc:Depends}
-Conflicts: libstdc++5-doc, libstdc++5-3.3-doc, libstdc++6-doc, libstdc++6-4.0-doc, libstdc++6-4.1-doc, libstdc++6-4.2-doc, libstdc++6-4.3-doc, libstdc++6-4.4-doc, libstdc++6-4.5-doc
-Description: GNU Standard C++ Library v3 (documentation files)
- This package contains documentation files for the GNU stdc++ library.
+Depends: gnat-4.6-base (= ${gnat:Version}), libgnatprj4.6 (= ${gnat:Version}), ${misc:Depends}
+Suggests: gnat
+Description: GNU Ada compiler Project Manager (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
.
- One set is the distribution documentation, the other set is the
- source documentation including a namespace list, class hierarchy,
- alphabetical list, compound list, file list, namespace members,
- compound members and file members.
-
-Package: gcc-4.6-soft-float
-Architecture: arm armel armhf
-Priority: optional
-Depends: gcc-4.6-base (= ${gcc:Version}), gcc-4.6 (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: gcc-4.4-soft-float, gcc-4.5-soft-float
-Description: GCC soft-floating-point gcc libraries (ARM)
- These are versions of basic static libraries such as libgcc.a compiled
- with the -msoft-float option, for CPUs without a floating-point unit.
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the debugging symbols.
-Package: gcc-4.6-source
-Architecture: all
-Priority: optional
-Depends: make (>= 3.81), autoconf2.64, automake, quilt, patchutils, gawk, ${misc:Depends}
-Description: Source of the GNU Compiler Collection
- This package contains the sources and patches which are needed to
- build the GNU Compiler Collection (GCC).
diff --git a/debian/patches/ada-symbolic-tracebacks.diff b/debian/patches/ada-symbolic-tracebacks.diff
index 69b47db..967e807 100644
--- a/debian/patches/ada-symbolic-tracebacks.diff
+++ b/debian/patches/ada-symbolic-tracebacks.diff
@@ -334,7 +334,7 @@ Index: b/src/gcc/ada/tracebak.c
32-bit x86/Linux as well and DWARF 2 unwind tables are emitted instead.
See the x86-64 case below for the drawbacks with this approach. */
-#if defined (linux) && (__GNUC__ * 10 + __GNUC_MINOR__ > 45)
-+#if (defined (linux) || defined(__GNU__) || defined(__kFreeBSD_kernel__)) && (__GNUC__ * 10 + __GNUC_MINOR__ > 45)
++#if (defined (linux) || defined(__GNU__) || defined(__FreeBSD_kernel__)) && (__GNUC__ * 10 + __GNUC_MINOR__ > 45)
#define USE_GCC_UNWINDER
#else
#define USE_GENERIC_UNWINDER
diff --git a/debian/patches/pr52714.diff b/debian/patches/pr52714.diff
index 8c31b56..4d3aabc 100644
--- a/debian/patches/pr52714.diff
+++ b/debian/patches/pr52714.diff
@@ -1,5 +1,5 @@
# DP: Proposed fix for PR rtl-optimization/52714:
-# DP: Revert gcc 4.6 to gcc the 4.5 version of the PR rtl-optimization/45695 fix:
+# DP: Revert gcc 4.6 to the gcc 4.5 version of the PR rtl-optimization/45695 fix:
--- a/src/gcc/combine.c
+++ b/src/gcc/combine.c
diff --git a/debian/rules.parameters b/debian/rules.parameters
index d378f67..823e482 100644
--- a/debian/rules.parameters
+++ b/debian/rules.parameters
@@ -2,15 +2,15 @@
GCC_VERSION := 4.6.4
NEXT_GCC_VERSION := 4.6.5
BASE_VERSION := 4.6
-SOURCE_VERSION := 4.6.4-2
-DEB_VERSION := 4.6.4-2
-DEB_EVERSION := 1:4.6.4-2
+SOURCE_VERSION := 4.6.4-0.1
+DEB_VERSION := 4.6.4-0.1
+DEB_EVERSION := 1:4.6.4-0.1
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.4-2
+DEB_LIBGCC_VERSION := 1:4.6.4-0.1
DEB_STDCXX_SOVERSION := 4.6
DEB_GCJ_SOVERSION := 4.6
PKG_GCJ_EXT := 12
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 338847a..240fcf5 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,5 +1,5 @@
-gcc-4.6: invalid-arch-string-in-source-relation
-gcc-4.6: quilt-build-dep-but-no-series-file
-gcc-4.6: weak-library-dev-dependency libgnatvsn4.6-dev on libgnatvsn4.6 (= ${gnat:Version})
-gcc-4.6: weak-library-dev-dependency libgnatprj4.6-dev on libgnatprj4.6 (= ${gnat:Version})
-gcc-4.6: weak-library-dev-dependency libgcj12-dev on libgcj12-awt (= ${gcj:Version})
+gnat-4.6: invalid-arch-string-in-source-relation
+gnat-4.6: quilt-build-dep-but-no-series-file
+gnat-4.6: weak-library-dev-dependency libgnatvsn4.6-dev on libgnatvsn4.6 (= ${gnat:Version})
+gnat-4.6: weak-library-dev-dependency libgnatprj4.6-dev on libgnatprj4.6 (= ${gnat:Version})
+gnat-4.6: weak-library-dev-dependency libgcj12-dev on libgcj12-awt (= ${gcj:Version})
Reply to: