* Let gcc depend on the binutils upstream version it was built with.

    Addresses #710142.


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

3 files changed, 20 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index 164493b..3961189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ gcc-4.7 (4.7.3-5) UNRELEASED; urgency=low
     Addresses: #710220.
   * Drop build dependency on automake, not used anymore.
   * Update the Linaro support to the 4.7-2013.06 release.
+  * Let gcc depend on the binutils upstream version it was built with.
+    Addresses #710142.
 
   [ Daniel Schepler ]
   * Update the x32 support from the branch.
diff --git a/debian/control.m4 b/debian/control.m4
index a6deabf..63805b4 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -66,7 +66,7 @@ Build-Depends: debhelper (>= 5.0.62), gcc-4.8-base,
   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-hppa64 (>= BINUTILSV) [hppa],
+  binutils-hppa64 (>= BINUTILSBDV) [hppa],
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext,
   texinfo (>= 4.3), sharutils,
   procps, FORTRAN_BUILD_DEP JAVA_BUILD_DEP GNAT_BUILD_DEP GO_BUILD_DEP GDC_BUILD_DEP SPU_BUILD_DEP
diff --git a/debian/rules.conf b/debian/rules.conf
index 0a0317a..287aa0d 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -182,11 +182,20 @@ DPKG_BUILD_DEP = dpkg-dev (>= $(DPKGV)),
 # the safe side (something like newest( version in stable, versions for the
 # various platforms in INSTALL/specific.html) ).
 # We need binutils (>= 2.22) for the --no-copy-dt-needed-entries default.
-BINUTILSV = 2.22
+BINUTILSBDV = 2.22
 ifeq ($(DEB_CROSS),yes)
-  BINUTILS_BUILD_DEP = binutils$(TS) (>= $(BINUTILSV)), binutils-multiarch (>= $(BINUTILSV))
+  BINUTILS_BUILD_DEP = binutils$(TS) (>= $(BINUTILSBDV)), binutils-multiarch (>= $(BINUTILSBDV))
+  BINUTILSV := $(shell dpkg -l binutils$(TS) \
+			| awk '/^ii/{print $$3;exit}' | sed 's/-.*//')
 else
-  BINUTILS_BUILD_DEP = binutils (>= $(BINUTILSV)) | binutils-multiarch (>= $(BINUTILSV))
+  BINUTILS_BUILD_DEP = binutils (>= $(BINUTILSBDV)) | binutils-multiarch (>= $(BINUTILSBDV))
+  ifeq ($(REVERSE_CROSS),yes)
+    BINUTILSV := $(shell dpkg -l binutils$(TS) \
+			| awk '/^ii/{print $$3;exit}' | sed 's/-.*//')
+  else
+    BINUTILSV := $(shell dpkg -l binutils binutils-multiarch \
+			| awk '/^ii/{print $$3;exit}' | sed 's/-.*//')
+  endif
 endif
 # FIXME; stripping doesn't work with gold
 #BINUTILS_BUILD_DEP += , binutils-gold (>= $(BINUTILSV)) [$(gold_archs)]
@@ -425,8 +434,8 @@ ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
   JAVA_BUILD_INDEP :=, $(JAVA_BUILD_INDEP)
 endif
 
-SPU_BUILD_DEP := binutils-spu (>= $(BINUTILSV)) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], gcc-$(BASE_VERSION)-base [powerpc ppc64],
-SPU_BUILD_DEP := binutils-spu (>= $(BINUTILSV)) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64],
+SPU_BUILD_DEP := binutils-spu (>= $(BINUTILSBDV)) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], gcc-$(BASE_VERSION)-base [powerpc ppc64],
+SPU_BUILD_DEP := binutils-spu (>= $(BINUTILSBDV)) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64],
 
 # FIXME: needs zlib?
 GO_BUILD_DEP := g++-4.6,
@@ -549,6 +558,7 @@ PKG_LIBGCJ_EXT = $(GCJ_SONAME1)$(if $(GCJ_SONAME2),-$(GCJ_SONAME2))
 
 ctrl_flags = \
 	-DBINUTILSV=$(BINUTILSV) \
+	-DBINUTILSBDV=$(BINUTILSBDV) \
 	-DSRCNAME=$(PKGSOURCE) \
 	-D__$(DEB_TARGET_GNU_CPU)__ \
 	-DARCH=$(DEB_TARGET_ARCH) \
@@ -1094,7 +1104,7 @@ check-versions:
 	  exit 1; \
 	fi
 	v=$$(dpkg-query -l binutils binutils-multiarch | awk '/^ii/ {print $$3;exit}'); \
-	if dpkg --compare-versions "$$v" lt "$(BINUTILSV)"; then \
-	  echo "binutils (>= $(BINUTILSV)) required, found $$v"; \
+	if dpkg --compare-versions "$$v" lt "$(BINUTILSBDV)"; then \
+	  echo "binutils (>= $(BINUTILSBDV)) required, found $$v"; \
 	  exit 1; \
 	fi