[gcc-6] 138/401: * Fix dependency resolution for libraries not built anymore from this source package.

[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 ca526fbe21c0db98de4411cfc642beb4fac63967
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon May 9 18:36:19 2016 +0000

      * Fix dependency resolution for libraries not built anymore from
        this source package.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8838 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog | 2 ++
 debian/rules2    | 6 +-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0afe7f7..d81d0c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ gcc-6 (6.1.1-2) UNRELEASED; urgency=medium
   * Tighten debhelper build dependency for cross build dependencies.
   * Allow build dependencies for musl configurations (Helmut Grohne).
     Closes: #823769.
+  * Fix dependency resolution for libraries not built anymore from
+    this source package.
 
   [ Samuel Thibault ]
   * patches/ada-hurd.diff: Fix Get_Page_Size type.
diff --git a/debian/rules2 b/debian/rules2
index cc1d72e..3961aac 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2364,13 +2364,9 @@ endif
 
 ifneq ($(with_common_libs),yes)
 # for native builds, the default ml libs are always available; no need for a placeholder
-  ifneq (,$(filter $(build_type),build-native))
-	rm -f debian/shlibs.common
-	touch debian/shlibs.common
-  else
+# 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
-  endif
 	$(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); \

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