[gcc-7] 243/354: libgnat-dev: use multiarch paths in project and to install .ali files.

[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 cdf9eec03fbf96fb9bfdd6807681512950e63583
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Jun 30 12:56:27 2017 +0000

    libgnat-dev: use multiarch paths in project and to install .ali files.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9565 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             |  1 +
 debian/rules.d/binary-ada.mk |  2 +-
 debian/rules2                | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6a185c..b5561fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gcc-7 (7.1.0-9) UNRELEASED; urgency=medium
   [ Nicolas Boulenguez ]
   * ada-gcc-name.diff: unpatch gnatchop. Addresses: #856274.
   * Link libgnat with libatomic on armel. Closes: #861734.
+  * libgnat-dev: use multiarch paths in project and to install .ali files.
 
  -- Matthias Klose <doko at debian.org>  Fri, 30 Jun 2017 08:32:40 +0200
 
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 3e5a52a..bc46376 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -139,7 +139,7 @@ endif
 $(binary_stamp)-libgnatvsn: $(install_stamp)
 	: # $(p_lgnatvsn_dev)
 ifneq (,$(filter $(build_type), build-native cross-build-native))
-	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) usr/lib/ada/adalib/gnatvsn
+	dh_install -p$(p_lgnatvsn_dev) $(usr_lib)/ada/adalib/gnatvsn
 	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) usr/share/ada/adainclude/gnatvsn
 	dh_install -p$(p_lgnatvsn_dev) usr/share/gpr/gnatvsn.gpr
 else
diff --git a/debian/rules2 b/debian/rules2
index 963a3a2..7dc88bf 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2045,10 +2045,13 @@ endif
 	  done
 
 ifneq ($(configured_libdir),$(libdir))
-	for i in debug go pkgconfig '*.so' '*.so.*' '*.a' '*.la' '*.py' '*.spec'; do \
+	for i in ada debug go pkgconfig '*.so' '*.so.*' '*.a' '*.la' '*.py' '*.spec'; do \
 	  mv $(d)/$(PF)/$(configured_libdir)/$$i \
 		$(d)/$(PF)/$(libdir)/. || true; \
 	done
+  ifeq ($(with_ada),yes)
+	sed -i s~$(PF)/$(configured_libdir)~$(PF)/$(libdir)~ $(d)/$(PF)/share/gpr/gnatvsn.gpr
+  endif
 endif
 
 	-ls -l $(d)/usr
@@ -2127,10 +2130,13 @@ ifeq ($(DEB_STAGE)-$(DEB_CROSS),rtlibs-yes)
 	done
 else
   ifneq ($(configured_libdir),$(libdir))
-	for i in debug go pkgconfig '*.so' '*.so.*' '*.a' '*.la' '*.o' '*.py' '*.spec'; do \
+	for i in ada debug go pkgconfig '*.so' '*.so.*' '*.a' '*.la' '*.o' '*.py' '*.spec'; do \
 	  mv $(d)/$(PF)/$(configured_libdir)/$$i \
 		$(d)/$(PF)/$(libdir)/. || true; \
 	done
+    ifeq ($(with_ada),yes)
+	sed -i s~$(PF)/$(configured_libdir)~$(PF)/$(libdir)~ $(d)/$(PF)/share/gpr/gnatvsn.gpr
+    endif
   endif
 endif
 

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