[gcc-7] 197/354: * Fix libmpx dependency generation for cross 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 7951b4cb490d13d58de5d9057c7e41d2634bfe49
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun May 21 19:52:51 2017 +0000

      * Fix libmpx dependency generation for cross builds.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9497 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                | 1 +
 debian/rules.d/binary-libmpx.mk | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 98a3baf..0da67e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ gcc-7 (7.1.0-6) UNRELEASED; urgency=medium
   * Fix gnat build dependencies on x32.
   * Build gnat on mips64 and powerpcspe.
   * Update the Linaro support to the 7-2017.05 snapshot.
+  * Fix libmpx dependency generation for cross builds.
 
  -- Matthias Klose <doko at debian.org>  Fri, 19 May 2017 09:20:41 -0700
 
diff --git a/debian/rules.d/binary-libmpx.mk b/debian/rules.d/binary-libmpx.mk
index ddb7ddf..c9dc0ca 100644
--- a/debian/rules.d/binary-libmpx.mk
+++ b/debian/rules.d/binary-libmpx.mk
@@ -41,7 +41,11 @@ define __do_mpx
 	ln -sf libmpx.symbols debian/$(p_l).symbols
 	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_l)
 	$(call cross_mangle_shlibs,$(p_l))
-	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l)
+	$(ignshld)DIRNAME=$(subst n,,$(2)) $(cross_shlibdeps) dh_shlibdeps -p$(p_l) \
+		$(call shlibdirs_to_search, \
+			$(subst mpx$(MPX_SONAME),gcc$(GCC_SONAME),$(p_l)) \
+		,$(2)) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_l))
 	echo $(p_l) $(p_d) >> debian/$(lib_binaries)
 

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