[gcc-6] 53/401: * Fix dependencies on target libraries which are not built anymore from this source.

[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 eee1612315aae8ebe691460ee32726d50bea8c1f
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Jan 19 01:50:47 2016 +0000

      * Fix dependencies on target libraries which are not built anymore
        from this source.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8606 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |  2 ++
 debian/rules.defs |  3 ---
 debian/rules2     | 13 ++++++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7edc6a0..9e868cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gcc-6 (6-20160117-2) experimental; urgency=medium
 
   * Fix gnat build failure on KFreeBSD (Steven Chamberlain). Closes: #811063).
+  * Fix dependencies on target libraries which are not built anymore
+    from this source.
 
  -- Matthias Klose <doko at debian.org>  Mon, 18 Jan 2016 13:35:20 +0100
 
diff --git a/debian/rules.defs b/debian/rules.defs
index e0f8c90..5c20818 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1974,9 +1974,6 @@ ifeq ($(DEB_CROSS),yes)
 	fi
   endef
   define cross_mangle_substvars
-	if [ -f debian/$(1).substvars ]; then \
-	  sed -i 's/lib[^ ,(]*/&$(cross_lib_arch)/g' debian/$(1).substvars; \
-	fi
   endef
 else
   define cross_mangle_shlibs
diff --git a/debian/rules2 b/debian/rules2
index 425b4c5..ebf74dc 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -1846,7 +1846,6 @@ ifneq ($(DEB_CROSS),yes)
   p_cppd = cpp$(pkg_ver)-doc
   p_cxx  = g++$(pkg_ver)
   p_doc  = gcc$(pkg_ver)-doc
-  p_lgcc = libgcc$(GCC_SONAME)
 else
   # only triggered if DEB_CROSS set
   p_base = gcc$(pkg_ver)$(cross_bin_arch)-base
@@ -1858,6 +1857,14 @@ else
 endif
 p_hppa64 = gcc$(pkg_ver)-hppa64-linux-gnu
 
+# needed for shlibs.common* generation
+ifeq (,$(p_lgcc))
+  p_lgcc = libgcc$(GCC_SONAME)$(cross_lib_arch)
+endif
+ifeq (,$(p_lib))
+  p_lib = libstdc++$(CXX_SONAME)$(cross_lib_arch)
+endif
+
 d	= debian/tmp
 d_base	= debian/$(p_base)
 d_xbase = debian/$(p_xbase)
@@ -2360,11 +2367,11 @@ ifneq ($(with_common_libs),yes)
 	touch debian/shlibs.common
   else
 	echo 'libgcc_s $(GCC_SONAME) $(p_lgcc)' > debian/shlibs.common
-	echo 'libstdc++ $(CXX_SONAME) libstdc++$(CXX_SONAME)' >> 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) lib$(ml)stdc++$(CXX_SONAME)' >> debian/shlibs.common$(ml); \
+	  echo 'libstdc++ $(CXX_SONAME) $(subst lib,lib$(ml),$(p_lib))' >> debian/shlibs.common$(ml); \
 	)
 endif
 

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