[gcc-6] 129/401: * Fix building cross gnat libs when not building the common libs.

[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 e47fb0429ec961afa05e281180386b32827cef90
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Apr 30 21:43:42 2016 +0000

      * Fix building cross gnat libs when not building the common libs.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8817 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             | 1 +
 debian/rules.d/binary-ada.mk | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91b5e8c..d84958a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-6 (6.1.1-2) UNRELEASED; urgency=medium
 
   * Call dh_makeshlibs with the --noscripts option when building a
     cross compiler.
+  * Fix building cross gnat libs when not building the common libs.
 
  -- Matthias Klose <doko at debian.org>  Sat, 30 Apr 2016 16:38:17 +0200
 
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index d4effb6..f9eccbe 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -130,7 +130,8 @@ endif
 	$(cross_shlibdeps) dh_shlibdeps -p$(p_lgnat) \
 		$(call shlibdirs_to_search, \
 			$(subst gnat-$(GNAT_SONAME),gcc$(GCC_SONAME),$(p_lgnat)) \
-		,)
+		,) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_lgnat))
 
 	: # $(p_lgnat_dbg)
@@ -179,7 +180,8 @@ endif
 		$(call shlibdirs_to_search, \
 			$(subst gnatvsn$(GNAT_SONAME),gcc$(GCC_SONAME),$(p_lgnatvsn)) \
 			$(subst gnatvsn$(GNAT_SONAME),gnat-$(GNAT_SONAME),$(p_lgnatvsn)) \
-		,)
+		,) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_lgnatvsn))
 
 	: # $(p_lgnatvsn_dbg)
@@ -227,7 +229,8 @@ endif
 			$(subst gnatprj$(GNAT_SONAME),gcc$(GCC_SONAME),$(p_lgnatprj)) \
 			$(subst gnatprj$(GNAT_SONAME),gnat-$(GNAT_SONAME),$(p_lgnatprj)) \
 			$(subst gnatprj$(GNAT_SONAME),gnatvsn$(GNAT_SONAME),$(p_lgnatprj)) \
-		,)
+		,) \
+		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
 	$(call cross_mangle_substvars,$(p_lgnatprj))
 
 	: # $(p_lgnatprj_dbg)

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