[gcc-6] 299/401: * Fix dependency generation for libgphobos multilib builds.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit a598151b2989050fa8eb9976bf8ef988f6d4d5f0
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Nov 24 21:08:27 2016 +0000

      * Fix dependency generation for libgphobos multilib builds.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9139 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |  6 ++++++
 debian/rules.conf | 13 ++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a1986a1..1557d19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-6 (6.2.1-6) UNRELEASED; urgency=medium
+
+  * Fix dependency generation for libgphobos multilib builds.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 24 Nov 2016 22:05:45 +0100
+
 gcc-6 (6.2.1-5) unstable; urgency=medium
 
   * Update to SVN 20161124 (r242827, 6.2.1) from the gcc-6-branch.
diff --git a/debian/rules.conf b/debian/rules.conf
index 7b77953..db9b4d9 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -26,10 +26,11 @@ _soname_map = gcc=$(GCC_SONAME) stdc++=$(CXX_SONAME) gomp=$(GOMP_SONAME) \
 	go=$(GO_SONAME) backtrace=$(BTRACE_SONAME) \
 	atomic=$(ATOMIC_SONAME) asan=$(ASAN_SONAME) lsan=$(LSAN_SONAME) \
 	tsan=$(TSAN_SONAME) ubsan=$(UBSAN_SONAME) \
-	vtv=$(VTV_SONAME) cilkrts=$(CILKRTS_SONAME) mpx=$(MPX_SONAME)
+	vtv=$(VTV_SONAME) cilkrts=$(CILKRTS_SONAME) mpx=$(MPX_SONAME) \
+	gphobos=$(GPHOBOS_SONAME)
 _soname = $(patsubst $(1)=%,%,$(filter $(1)=%,$(_soname_map)))
 
-rel_on_dev := $(if $(filter libgcc-$(BASE_VERSION)-dev$(LS), $(shell dh_listpackages -i)),>=,=)
+rel_on_dev := $(if $(cross_lib_arch),>=,=)
 # $(call _lib_name,<name>,<biarch>,<ext>)
 _lib_name = $(subst $(SPACE),, \
   lib$(2)$(1) \
@@ -103,7 +104,7 @@ $(foreach x,stdc++ gomp ssp gfortran itm objc atomic asan lsan mpx ubsan quadmat
 	$(eval $(call gen_multilib_deps,$(x),,$$$${gcc:Version})))
 $(foreach x,gcc stdc++ gfortran objc go gphobos, \
 	$(eval $(call gen_multilib_deps,$(x),dev,$$$${gcc:Version})))
-$(foreach x,gcc stdc++ gfortran objc go, \
+$(foreach x,gcc stdc++ gfortran objc go gphobos, \
 	$(eval $(call gen_multilib_deps,$(x),dbg,$$$${gcc:Version})))
 
 # Helper to generate _no_archs variables.
@@ -1284,6 +1285,12 @@ ifeq ($(multilib),yes)
 	echo 'dep:libgobiarch=$(libgobiarch)' \
 		>> debian/substvars.local.tmp
   endif
+  ifeq ($(with_libphobosdev),yes)
+	echo 'dep:libphobosbiarchdev=$(libgphobosbiarchdev)' \
+		>> debian/substvars.local.tmp
+	echo 'dep:libphobosbiarch=$(libgphobosbiarch)' \
+		>> debian/substvars.local.tmp
+  endif
 endif
 ifneq ($(with_standalone_gcj),yes)
   ifneq (,$(filter $(DEB_HOST_ARCH),armel armhf))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git