[gcc-7] 258/354: Only build gnatvsn as a native library.

Thu Nov 23 15:51:03 UTC 2017

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 68596335a121761cd14c2fc9b739e587d5112d15
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Jul 28 10:54:12 2017 +0000

    Only build gnatvsn as a native library.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9596 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                   |  4 ++++
 debian/control.m4                  | 16 ++++++++--------
 debian/patches/ada-libgnatvsn.diff |  6 ++----
 debian/patches/ada-sjlj.diff       |  4 ++--
 debian/rules.d/binary-ada.mk       | 17 ++++++++---------
 debian/rules2                      |  7 -------
 6 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8def67..66cc876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 gcc-7 (7.1.0-11) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Update sanitizer symbols for ppc64 and sparc64.
 
+  [ Nicolas Boulenguez ]
+  * Only build gnatvsn as a native library.
+
  -- Matthias Klose <doko at debian.org>  Mon, 24 Jul 2017 13:41:34 +0200
 
 gcc-7 (7.1.0-10) unstable; urgency=medium
diff --git a/debian/control.m4 b/debian/control.m4
index 327fd59..433fa13 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4649,14 +4649,13 @@ Description: runtime for applications compiled with GNAT (debugging symbols)
  .
  This package contains the debugging symbols.
 
+ifdef(`TARGET',`',`
 Package: libgnatvsn`'GNAT_V-dev`'LS
 Section: libdevel
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
+Architecture: any
 Priority: extra
-Depends: BASELDEP, ifdef(`TARGET',`',`gnat`'PV`'TS (ifdef(`TARGET',`>= ${gnat:SoftVersion}',`= ${gnat:Version}')),')
+Depends: BASELDEP, gnat`'PV`'TS (= ${gnat:Version}),
  libgnatvsn`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
-ifdef(`TARGET',`Recommends: gnat`'PV`'TS (>= ${gnat:SoftVersion})
-')`'dnl
 Conflicts: libgnatvsn-dev (<< `'GNAT_V),
  libgnatvsn4.1-dev, libgnatvsn4.3-dev, libgnatvsn4.4-dev,
  libgnatvsn4.5-dev, libgnatvsn4.6-dev, libgnatvsn4.9-dev,
@@ -4673,12 +4672,12 @@ Description: GNU Ada compiler selected components (development files)
  This package contains the development files and static library.
 
 Package: libgnatvsn`'GNAT_V`'LS
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
+Architecture: any
 ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 ')`'dnl
-Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-Section: ifdef(`TARGET',`devel',`libs')
+Priority: PRI(optional)
+Section: libs
 Depends: BASELDEP, libgnat`'-GNAT_V`'LS (= ${gnat:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -4693,7 +4692,7 @@ Description: GNU Ada compiler selected components (shared library)
  This package contains the runtime shared library.
 
 Package: libgnatvsn`'GNAT_V-dbg`'LS
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
+Architecture: any
 ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 ')`'dnl
@@ -4711,6 +4710,7 @@ Description: GNU Ada compiler selected components (debugging symbols)
  GPL, allowing to link proprietary programs with it.
  .
  This package contains the debugging symbols.
+')`'dnl native
 ')`'dnl libgnat
 
 ifenabled(`lib64gnat',`
diff --git a/debian/patches/ada-libgnatvsn.diff b/debian/patches/ada-libgnatvsn.diff
index df19e4f..8f6cf15 100644
--- a/debian/patches/ada-libgnatvsn.diff
+++ b/debian/patches/ada-libgnatvsn.diff
@@ -268,14 +268,12 @@
  AC_ARG_ENABLE(libssp,
 --- a/src/gcc/ada/gcc-interface/config-lang.in
 +++ b/src/gcc/ada/gcc-interface/config-lang.in
-@@ -34,8 +34,8 @@
+@@ -34,7 +34,7 @@
  
  outputs="ada/gcc-interface/Makefile ada/Makefile"
  
 -target_libs="target-libada"
--lang_dirs="libada gnattools"
 +target_libs="target-libada target-libgnatvsn"
-+lang_dirs="libada libgnatvsn gnattools"
+ lang_dirs="libada gnattools"
  
  # Ada is not enabled by default for the time being.
- build_by_default=no
diff --git a/debian/patches/ada-sjlj.diff b/debian/patches/ada-sjlj.diff
index 0fef72b..d86a44a 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -481,9 +481,9 @@ Index: b/src/gcc/ada/gcc-interface/config-lang.in
  outputs="ada/gcc-interface/Makefile ada/Makefile"
  
 -target_libs="target-libada target-libgnatvsn"
--lang_dirs="libada libgnatvsn gnattools"
+-lang_dirs="libada gnattools"
 +target_libs="target-libada target-libgnatvsn target-libada-sjlj"
-+lang_dirs="libada libgnatvsn gnattools libada-sjlj"
++lang_dirs="libada gnattools libada-sjlj"
  
  # Ada is not enabled by default for the time being.
  build_by_default=no
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index bc46376..4036130 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -3,7 +3,14 @@ ifeq ($(with_separate_gnat),yes)
 endif
 
 ifeq ($(with_libgnat),yes)
-  $(lib_binaries) += libgnat libgnatvsn
+  # During native builds, gnat-BV Depends:
+  # * libgnat, libgnatvsn because gnat1 is linked dynamically
+  # * libgnat             because of the development symlink.
+  # During cross builds, gnat1 is linked statically. Only the latter remains.
+  $(lib_binaries) += libgnat
+  ifneq ($(DEB_CROSS),yes)
+    $(lib_binaries) += libgnatvsn
+  endif
 endif
 
 arch_binaries := $(arch_binaries) ada
@@ -138,15 +145,9 @@ endif
 
 $(binary_stamp)-libgnatvsn: $(install_stamp)
 	: # $(p_lgnatvsn_dev)
-ifneq (,$(filter $(build_type), build-native cross-build-native))
 	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
-	mkdir -p $(d_lgnatvsn_dev)/$(gcc_lib_dir)/{adalib,adainclude}/gnatvsn
-	mv $(d)/usr/lib/ada/adalib/gnatvsn $(d_lgnatvsn_dev)/$(gcc_lib_dir)/adalib/.
-	mv $(d)/usr/share/ada/adainclude/gnatvsn $(d_lgnatvsn_dev)/$(gcc_lib_dir)/adainclude/.
-endif
 	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) $(usr_lib)/libgnatvsn.a
 	dh_link -p$(p_lgnatvsn_dev) \
 	   $(usr_lib)/libgnatvsn.so.$(GNAT_VERSION) \
@@ -155,11 +156,9 @@ endif
 	dh_strip -p$(p_lgnatvsn_dev) -X.a --keep-debug
 
 	: # $(p_lgnatvsn)
-ifneq (,$(filter $(build_type), build-native cross-build-native))
 	mkdir -p $(d_lgnatvsn)/usr/share/lintian/overrides
 	echo missing-dependency-on-libc \
 	  > $(d_lgnatvsn)/usr/share/lintian/overrides/$(p_lgnatvsn)
-endif
 	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn) $(usr_lib)/libgnatvsn.so.$(GNAT_VERSION)
 	debian/dh_doclink -p$(p_lgnatvsn) $(p_glbase)
 	dh_strip -p$(p_lgnatvsn) --dbg-package=$(p_lgnatvsn_dbg)
diff --git a/debian/rules2 b/debian/rules2
index 7dc88bf..fdf1661 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -2198,13 +2198,6 @@ ifneq ($(with_libgnat),yes)
 	rm -f $(d)/$(gcc_lib_dir)/adalib/lib*.so*
 endif
 
-# FIXME: libgnatvsn needs proper configure/Makefile
-ifeq ($(DEB_CROSS),yes)
-  ifeq ($(with_ada),yes)
-	mv $(d)/$(PF)/lib/libgnatvsn* $(d)/$(usr_lib)/. || true
-  endif
-endif
-
 #  ifeq ($(with_ada),yes)
 #	: # rename files (versioned ada binaries)
 #	for i in ; do \

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

