* Ensure that the common libs (built from the next GCC version) are

    available when building without common libs.


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

4 files changed, 12 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 6a328af..a42dcd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ gcc-4.8 (4.8.2-22) UNRELEASED; urgency=medium
   * Install only versioned gcc-ar gcc-nm gcc-ranlib binaries for the hppa64
     cross compiler, update hppa64 alternatives. Closes: #745967.
   * Fix the as and ld symlinks for the hppa64 cross compiler.
+  * Ensure that the common libs (built from the next GCC version) are
+    available when building without common libs.
 
  -- Matthias Klose <doko@debian.org>  Sun, 27 Apr 2014 12:43:30 +0200
 
diff --git a/debian/control b/debian/control
index 9bcced4..ba77b69 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel mipsn32 mipsn32el powerpc ppc64 s390 s390x sparc sparc64 x32], 
   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 mipsn32 mipsn32el mips64 mips64el s390x sparc64 x32], libn32gcc1 [mips mipsel mips64 mips64el], lib64gcc1 [i386 mips mipsel mipsn32 mipsn32el powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel mipsn32 mipsn32el], libc6-dev-mipsn32 [mips mipsel mips64 mips64el], libc6-dev-mips32 [mipsn32 mipsn32el mips64 mips64el], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, 
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any], 
-  m4, libtool, autoconf2.64, 
+  m4, libtool, autoconf2.64, gcc-4.9-base, 
   libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], 
   zlib1g-dev, gawk, lzma, xz-utils, patchutils, 
   binutils (>= 2.23.52) | binutils-multiarch (>= 2.23.52), binutils-hppa64 (>= 2.23.52) [hppa], 
diff --git a/debian/control.m4 b/debian/control.m4
index 3801fba..88c6638 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -64,7 +64,7 @@ Build-Depends: debhelper (>= 5.0.62),
 Build-Depends: debhelper (>= 5.0.62), GCC_MULTILIB_BUILD_DEP
   LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBC_DBG_DEP
   kfreebsd-kernel-headers (>= 0.84) [kfreebsd-any],
-  AUTO_BUILD_DEP AUTOGEN_BUILD_DEP
+  AUTO_BUILD_DEP AUTOGEN_BUILD_DEP BASE_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 (>= BINUTILSBDV) [hppa],
diff --git a/debian/rules.conf b/debian/rules.conf
index 7f8d5f7..1b59492 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -379,6 +379,13 @@ endif
 AUTO_BUILD_DEP := m4, libtool,
 AUTO_BUILD_DEP += autoconf2.64,
 
+# ensure that the common libs, built from the next GCC version are available
+ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
+  ifneq ($(with_common_libs),yes)
+    BASE_BUILD_DEP = gcc-4.9-base,
+  endif
+endif
+
 ifneq ($(DEB_CROSS),yes)
 JAVA_BUILD_DEP := zlib1g-dev, libantlr-java, python, libffi-dev,
 
@@ -578,6 +585,7 @@ ctrl_flags += \
 	-DLIBC_BIARCH_BUILD_DEP="$(LIBC_BIARCH_BUILD_DEP)" \
 	-DLIBC_DBG_DEP="$(LIBC_DBG_DEP)" \
 	-DFORTRAN_BUILD_DEP="$(FORTRAN_BUILD_DEP)" \
+	-DBASE_BUILD_DEP="$(BASE_BUILD_DEP)" \
 	-DGNAT_BUILD_DEP="$(GNAT_BUILD_DEP)" \
 	-DJAVA_BUILD_DEP="$(JAVA_BUILD_DEP)" \
 	-DGO_BUILD_DEP="$(GO_BUILD_DEP)" \