* Fix control file for builds without the x32 multilibs

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6708 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

2 files changed, 11 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 0423bb5..11af7d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-4.7 (4.7.3-3) UNRELEASED; urgency=low
+
+  * Fix control file for builds without the x32 multilibs
+
+ -- Matthias Klose <doko@debian.org>  Sun, 21 Apr 2013 19:33:07 +0200
+
 gcc-4.7 (4.7.3-2) experimental; urgency=low
 
   * Update to SVN 20130421 (r198115) from the gcc-4_7-branch.
@@ -5,7 +11,6 @@ gcc-4.7 (4.7.3-2) experimental; urgency=low
       PR target/55487 (parisc), PR c++/56388, PR fortran/56994,
       PR middle-end/56848, PR middle-end/56077, PR tree-optimization/48189.
   * Use target specific names for libstdc++ baseline files. LP: #1168267.
-  * Fix control file for builds without the x32 multilibs
   * Ignore the return value for dh_shlibdeps for builds on precise/ARM.
   * In gnatlink, pass the options and libraries after objects to the
     linker to avoid link failures with --as-needed. Addresses: #680292.
diff --git a/debian/control.m4 b/debian/control.m4
index ebe3fd3..94f8ffa 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -643,7 +643,6 @@ ifdef(`TARGET', `dnl
  This package contains files for TARGET architecture, for use in cross-compile
  environment.
 ')`'dnl
-')`'dnl libx32gcc
 
 ifenabled(`cdev',`
 Package: libx32gcc`'PV-dev`'LS
@@ -658,6 +657,7 @@ 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.
 ')`'dnl cdev
+')`'dnl libx32gcc
 
 ifdef(`TARGET', `', `
 ifenabled(`libgmath',`
@@ -1758,6 +1758,7 @@ Description: Runtime library for GNU Objective-C applications (n32 development f
  This package contains the headers and static library files needed to build
  GNU ObjC applications.
 
+ifenabled(`libx32objc',`
 Package: libx32objc`'PV-dev`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchx32_archs')
 Section: libdevel
@@ -1768,6 +1769,7 @@ BUILT_USING`'dnl
 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.
+')`'dnl libx32objc
 
 ifenabled(`armml',`
 Package: libhfobjc`'PV-dev`'LS
@@ -2051,6 +2053,7 @@ Description: Runtime library for GNU Fortran applications (n32 development files
  This package contains the headers and static library files needed to build
  GNU Fortran applications.
 
+ifenabled(`libx32gfortran',`
 Package: libx32gfortran`'PV-dev`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`biarchx32_archs')
 Section: libdevel
@@ -2062,6 +2065,7 @@ BUILT_USING`'dnl
 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.
+')`'dnl libx32gfortran
 
 ifenabled(`armml',`
 Package: libhfgfortran`'PV-dev`'LS