[gcc-7] 184/354: * Fix building libgfortran and libgphobos when building without common libs.

[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 03a672d430719ead459702aa28327f1232f6711d
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat May 6 22:04:57 2017 +0000

      * Fix building libgfortran and libgphobos when building without common libs.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9452 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog           | 2 +-
 debian/rules.d/binary-d.mk | 5 ++++-
 debian/rules2              | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b6bc8a5..8dff13f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ gcc-7 (7.1.0-5) UNRELEASED; urgency=medium
 
   * Disable offload compilers for snapshot builds.
   * Build libgo when not building common libs.
-  * Fix building libgfortran when building without common libs.
+  * Fix building libgfortran and libgphobos when building without common libs.
 
  -- Matthias Klose <doko at debian.org>  Fri, 05 May 2017 13:47:57 +0200
 
diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk
index 21b27da..434fcc6 100644
--- a/debian/rules.d/binary-d.mk
+++ b/debian/rules.d/binary-d.mk
@@ -176,7 +176,10 @@ define __do_libphobos
 	rm -f debian/$(p_l).symbols
 	$(call cross_mangle_shlibs,$(p_l))
 	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
-		$(call shlibdirs_to_search,$(subst gphobos$(GPHOBOS_SONAME),gcc$(GCC_SONAME),$(p_l)),$(2))
+		$(call shlibdirs_to_search, \
+			$(subst gphobos$(GPHOBOS_SONAME),gcc$(GCC_SONAME),$(p_l)) \
+		,$(2)) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_l))
 	dh_lintian -p$(p_l)
 	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
diff --git a/debian/rules2 b/debian/rules2
index a22b6ef..e3e4076 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2286,9 +2286,11 @@ ifneq ($(with_common_libs),yes)
 # apparently this changed with newer dpkg versions (1.18.7?) ...
 	echo 'libgcc_s $(GCC_SONAME) $(p_lgcc)' > debian/shlibs.common
 	echo 'libstdc++ $(CXX_SONAME) $(p_lib)' >> debian/shlibs.common
+	echo 'libquadmath $(QUADMATH_SONAME) libquadmath$(QUADMATH_SONAME)' >> debian/shlibs.common
 	$(foreach ml,32 64 n32 x32 hf sf, \
 	  echo 'libgcc_s $(GCC_SONAME) $(subst lib,lib$(ml),$(p_lgcc))' > debian/shlibs.common$(ml); \
 	  echo 'libstdc++ $(CXX_SONAME) $(subst lib,lib$(ml),$(p_lib))' >> debian/shlibs.common$(ml); \
+	  echo 'libquadmath $(QUADMATH_SONAME) lib$(ml)quadmath$(QUADMATH_SONAME)' >> debian/shlibs.common$(ml); \
 	)
 endif
 

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