Bug#844367: Debian local ada patches need an update for GCC 7

[Nicolas Boulenguez]

Package: src:gcc-7
Followup-For: Bug #844367

Please apply this fixed libgnatvsn-with-gnat-7-safe.diff.  It only
handles cosmetic issues, applies on 7-20170226-1 and builds with
DEB_BUILD_OPTIONS="lang=ada nocheck noopt nostrap nolang=...".

Please ignore libgnatvsn-with-gnat-7.diff, it requires some review and
minimal testing.
Description: trivial fixes for gcc-7/7-20170129-1
 Remove obsolete references to libgnatprj, but keep existing
 references to libgnatvsn as it will be restored.
 .
 Drop obsolete and unapplied ada-default-project-path.diff.
 .
 debian/copyright must be regenerated from the updated copyright.in.
 .
 Remove libgnatvsn7.overrides, currently unused and replaced with a
 more simple solution once libgnatvsn is restored.
Author: Nicolas Boulenguez 

--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -48,7 +48,6 @@ gcc-@BV@-source  The sources with patches
 
 Ada:
 libgnatvsn-dev, libgnatvsn@BV@   GNAT version library
-libgnatprj-dev, libgnatprj@BV@   GNAT Project Manager library
 
 C:
 cpp-@BV@, cpp-@BV@-docGNU C Preprocessor
@@ -116,9 +115,6 @@ Runtime Library Exception (included in this file):
  - Various config files in gcc/config/ used in runtime libraries.
  - libvtv
 
-In contrast, libgnatprj is licensed under the terms of the pure GNU
-General Public License.
-
 The libbacktrace library is licensed under the following terms:
 
 Redistribution and use in source and binary forms, with or without
--- a/debian/gnatprj.gpr
+++ /dev/null
@@ -1,32 +0,0 @@
---  Project file for use with GNAT
---  Copyright (c) 2005, 2008 Ludovic Brenta 
---
---  This program is free software; you can redistribute it and/or modify
---  it under the terms of the GNU General Public License as published by
---  the Free Software Foundation; either version 3 of the License, or
---  (at your option) any later version.
---
---  This program is distributed in the hope that it will be useful,
---  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---  GNU General Public License for more details.
---
---  This project file is designed to help build applications that use
---  GNAT project files.  Here is an example of how to use this project file:
---
---  with "gnatprj";
---  project Example is
--- for Object_Dir use "obj";
--- for Exec_Dir use ".";
--- for Main use ("example");
---  end Example;
-
-with "gnatvsn.gpr";
-project Gnatprj is
-   for Library_Name use "gnatprj";
-   for Library_Dir use "/usr/lib";
-   for Library_Kind use "dynamic";
-   for Source_Dirs use ("/usr/share/ada/adainclude/gnatprj");
-   for Library_ALI_Dir use "/usr/lib/ada/adalib/gnatprj";
-   for Externally_Built use "true";
-end Gnatprj;
--- a/debian/libgnatprj7.overrides
+++ /dev/null
@@ -1 +0,0 @@
-libgnatprj7 binary: missing-dependency-on-libc
--- a/debian/libgnatvsn7.overrides
+++ /dev/null
@@ -1 +0,0 @@
-libgnatvsn7 binary: missing-dependency-on-libc
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -32,8 +32,6 @@ d_gnatsjlj	= debian/$(p_gnatsjlj)
 d_lgnat	= debian/$(p_lgnat)
 d_lgnatvsn = debian/$(p_lgnatvsn)
 d_lgnatvsn_dev = debian/$(p_lgnatvsn_dev)
-d_lgnatprj = debian/$(p_lgnatprj)
-d_lgnatprj_dev = debian/$(p_lgnatprj_dev)
 d_gnatd	= debian/$(p_gnatd)
 
 GNAT_TOOLS = gnat gnatbind gnatchop gnatclean gnatfind gnatkr gnatlink \
@@ -241,7 +239,7 @@ endif
 	find $(d_gnat) -name '*.ali' | xargs chmod 444
 	$(cross_shlibdeps) dh_shlibdeps -p$(p_gnat) \
 		$(call shlibdirs_to_search, \
-			$(p_lgcc) $(p_lgnat) $(p_lgnatvsn) $(p_lgnatprj) \
+			$(p_lgcc) $(p_lgnat) $(p_lgnatvsn) \
 		,)
 	echo $(p_gnat) >> debian/arch_binaries
 
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -117,10 +117,6 @@ debian_patches += ada-arm
 # there should be no harm to always apply these, except for new GCC versions
 #ifeq ($(with_ada),yes)
 
-# FIXME: needs an update
-#  debian_patches += \
-#	ada-default-project-path
-
   debian_patches += \
 	ada-driver-check \
 	ada-gcc-name \
--- a/debian/rules2
+++ b/debian/rules2
@@ -2181,12 +2181,10 @@ ifneq ($(with_libgnat),yes)
 	rm -f $(d)/$(gcc_lib_dir)/adalib/lib*.so*
 endif
 
-# FIXME: libgnatprj and libgnatvsn need proper configury/Makefiles
+# FIXME: libgnatvsn needs proper configure/Makefile
 ifeq ($(DEB_CROSS),yes)
   ifeq ($(with_ada),yes)
-	for i in 'libgnatprj*' 'libgnatvsn*'; do \
-	  mv $(d)/$(PF)/lib/$$i $(d)/$(usr_lib)/. || true; \
-	done
+	mv $(d)/$(PF)/lib/libgnatvsn* $(d)/$(usr_lib)/. || true
   endif
 endif
 
--- a/debian/patches/ada-default-project-path.diff
+++ /dev/null
@@ -1,134 +0,0 @@
-# DP: - Change the default search path for project files to the one specified
-# DP:   by the Debian Policy for Ada: /usr/share/ada/adainclude.
-
-Index: b/src/gcc/ada/Make-generated.in
-===
 a/src/gcc/ada/Make-generated.in
-+++ 

Bug#844367: Debian local ada patches need an update for GCC 7

[Matthias Klose]

On 24.02.2017 17:21, Nicolas Boulenguez wrote:
> Package: src:gcc-7
> Followup-For: Bug #844367
> 
> Hello.
> 
> Despite my overoptimistic expectations, libgnatvsn is still required.
> 
> libgnatvsn-with-gnat-7-safe.diff applies to gcc-7/7-20170129-1. It has
> not been tested, but only fixes trivial issues and can probably be
> applied now.
> 
> libgnatvsn-with-gnat-7.diff starts the actual restoration of
> libgnatvsn. It may be a starting point to work on this bug.

Do you want me to apply this now, or would you like to complete this work?

Bug#844367: Debian local ada patches need an update for GCC 7

[Nicolas Boulenguez]

Package: src:gcc-7
Followup-For: Bug #844367

Hello.

Despite my overoptimistic expectations, libgnatvsn is still required.

libgnatvsn-with-gnat-7-safe.diff applies to gcc-7/7-20170129-1. It has
not been tested, but only fixes trivial issues and can probably be
applied now.

libgnatvsn-with-gnat-7.diff starts the actual restoration of
libgnatvsn. It may be a starting point to work on this bug.
Description: trivial fixes for gcc-7/7-20170129-1
 Remove obsolete references to libgnatprj, but keep existing
 references to libgnatvsn as it will be restored.
 .
 Drop obsolete and unapplied ada-default-project-path.diff.
 .
 debian/copyright must be regenerated from the updated copyright.in.
 .
 Remove libgnatvsn7.overrides, currently unused and replaced with a
 more simple solution once libgnatvsn is restored.
 .
 Fix impbit.out line in patches/ada-acats.diff, currently wrong in
 gcc-7 (`|sed instead of |sed`, and only spaces instead of blank and
 spaces, see 814978).
 .
 These changes have not been tested.
Author: Nicolas Boulenguez 

--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -48,7 +48,6 @@ gcc-@BV@-source  The sources with patches
 
 Ada:
 libgnatvsn-dev, libgnatvsn@BV@   GNAT version library
-libgnatprj-dev, libgnatprj@BV@   GNAT Project Manager library
 
 C:
 cpp-@BV@, cpp-@BV@-docGNU C Preprocessor
@@ -116,9 +115,6 @@ Runtime Library Exception (included in this file):
  - Various config files in gcc/config/ used in runtime libraries.
  - libvtv
 
-In contrast, libgnatprj is licensed under the terms of the pure GNU
-General Public License.
-
 The libbacktrace library is licensed under the following terms:
 
 Redistribution and use in source and binary forms, with or without
--- a/debian/gnatprj.gpr
+++ /dev/null
@@ -1,32 +0,0 @@
---  Project file for use with GNAT
---  Copyright (c) 2005, 2008 Ludovic Brenta 
---
---  This program is free software; you can redistribute it and/or modify
---  it under the terms of the GNU General Public License as published by
---  the Free Software Foundation; either version 3 of the License, or
---  (at your option) any later version.
---
---  This program is distributed in the hope that it will be useful,
---  but WITHOUT ANY WARRANTY; without even the implied warranty of
---  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
---  GNU General Public License for more details.
---
---  This project file is designed to help build applications that use
---  GNAT project files.  Here is an example of how to use this project file:
---
---  with "gnatprj";
---  project Example is
--- for Object_Dir use "obj";
--- for Exec_Dir use ".";
--- for Main use ("example");
---  end Example;
-
-with "gnatvsn.gpr";
-project Gnatprj is
-   for Library_Name use "gnatprj";
-   for Library_Dir use "/usr/lib";
-   for Library_Kind use "dynamic";
-   for Source_Dirs use ("/usr/share/ada/adainclude/gnatprj");
-   for Library_ALI_Dir use "/usr/lib/ada/adalib/gnatprj";
-   for Externally_Built use "true";
-end Gnatprj;
--- a/debian/libgnatprj7.overrides
+++ /dev/null
@@ -1 +0,0 @@
-libgnatprj7 binary: missing-dependency-on-libc
--- a/debian/libgnatvsn7.overrides
+++ /dev/null
@@ -1 +0,0 @@
-libgnatvsn7 binary: missing-dependency-on-libc
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -32,8 +35,6 @@ d_gnatsjlj	= debian/$(p_gnatsjlj)
 d_lgnat	= debian/$(p_lgnat)
 d_lgnatvsn = debian/$(p_lgnatvsn)
 d_lgnatvsn_dev = debian/$(p_lgnatvsn_dev)
-d_lgnatprj = debian/$(p_lgnatprj)
-d_lgnatprj_dev = debian/$(p_lgnatprj_dev)
 d_gnatd	= debian/$(p_gnatd)
 
 GNAT_TOOLS = gnat gnatbind gnatchop gnatclean gnatfind gnatkr gnatlink \
@@ -241,7 +291,7 @@ endif
 	find $(d_gnat) -name '*.ali' | xargs chmod 444
 	$(cross_shlibdeps) dh_shlibdeps -p$(p_gnat) \
 		$(call shlibdirs_to_search, \
-			$(p_lgcc) $(p_lgnat) $(p_lgnatvsn) $(p_lgnatprj) \
+			$(p_lgcc) $(p_lgnat) $(p_lgnatvsn) \
 		,)
 	echo $(p_gnat) >> debian/arch_binaries
 
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -116,10 +116,6 @@ debian_patches += ada-arm
 # there should be no harm to always apply these, except for new GCC versions
 #ifeq ($(with_ada),yes)
 
-# FIXME: needs an update
-#  debian_patches += \
-#	ada-default-project-path
-
   debian_patches += \
 	ada-driver-check \
 	ada-gcc-name \
--- a/debian/rules2
+++ b/debian/rules2
@@ -2171,12 +2171,10 @@ ifneq ($(with_libgnat),yes)
 	rm -f $(d)/$(gcc_lib_dir)/adalib/lib*.so*
 endif
 
-# FIXME: libgnatprj and libgnatvsn need proper configury/Makefiles
+# FIXME: libgnatvsn needs proper configure/Makefile
 ifeq ($(DEB_CROSS),yes)
   ifeq ($(with_ada),yes)
-	for i in 'libgnatprj*' 'libgnatvsn*'; do \
-	  mv $(d)/$(PF)/lib/$$i $(d)/$(usr_lib)/. || true; \
-	done
+	mv $(d)/$(PF)/lib/libgnatvsn* $(d)/$(usr_lib)/. || true; \
   endif
 endif
 
--- a/debian/patches/ada-acats.diff
+++ b/debian/patches/ada-acats.diff
@@ -33,7 +107,7 @@ Index: 

Bug#844367: Debian local ada patches need an update for GCC 7

[Matthias Klose]

The libgnatprj/libgnatvsn patches are now removed. The ada-default-project-path
patch is not yet applied, and needs an update for GCC 7.

Bug#844367: Debian local ada patches need an update for GCC 7

[Matthias Klose]

Package: src:gcc-7
Severity: important
Tags: sid buster

The Debian local ada patches need an update for GCC 7.  The
libgnatprj/libgnatvsn patches probably need to be dropped, if they can't be
updated [1].

[1] https://lists.debian.org/debian-ada/2016/10/msg0.html