[gcc-7] 55/354: * 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 master
in repository gcc-7.

commit ec0b24ded15cf2276850fc87d23d88ed47784092
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Nov 24 21:09:44 2016 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 5a06ce1..aaaca31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ gcc-7 (7-20161124-1) UNRELEASED; urgency=medium
   * Drop the work around for PR libstdc++/65913.
   * gdc: Link with the shared libgphobos runtime by default.
   * Fix PR middle-end/78501, proposed patch.
+  * Fix dependency generation for libgphobos multilib builds.
 
   [ YunQiang Su ]
   * Update gnat patches for GCC 7, stop building libgnatvsn and libgnatprj.
diff --git a/debian/rules.conf b/debian/rules.conf
index f361c86..7a130ac 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.
@@ -1264,6 +1265,12 @@ ifeq ($(DEB_CROSS),yes)
 	  ln -s $$f $$link; \
 	done
   endif
+  ifeq ($(with_libphobosdev),yes)
+	echo 'dep:libphobosbiarchdev=$(libgphobosbiarchdev)' \
+		>> debian/substvars.local.tmp
+	echo 'dep:libphobosbiarch=$(libgphobosbiarch)' \
+		>> debian/substvars.local.tmp
+  endif
 endif
 
 versioned-files:

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