[gcc-7] 221/354: ada-link-lib.diff: remove dubious changes without explaination in VCS log. - pass CFLAGS_FOR_TARGET again (from 8045) - no need for AM_MAKEFLAGS without automake (from 9081) - disable warnings during cross builds. (from 8045)

[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 a741e24507d04317f4c030b4ea014dec7c034131
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sun Jun 18 01:10:09 2017 +0000

    ada-link-lib.diff: remove dubious changes without explaination in VCS log.
    - pass CFLAGS_FOR_TARGET again (from 8045)
    - no need for AM_MAKEFLAGS without automake (from 9081)
    - disable warnings during cross builds. (from 8045)
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9524 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                 |  1 +
 debian/patches/ada-link-lib.diff | 60 ++++++++++++----------------------------
 2 files changed, 19 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bba5e8..7940a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ gcc-7 (7.1.0-7) UNRELEASED; urgency=medium
   * ada: Drop references to obsolete termio-h.diff. Closes: #845159.
   * ada-749574.diff: replace work-around with fix and forward it.
   * ada-kfreebsd.diff: reduce a lot thanks to Ada2012 syntax.
+  * ada-link-lib.diff: remove dubious parts.
 
  -- Matthias Klose <doko at debian.org>  Sat, 17 Jun 2017 15:56:17 +0200
 
diff --git a/debian/patches/ada-link-lib.diff b/debian/patches/ada-link-lib.diff
index dcb4e16..242f8a0 100644
--- a/debian/patches/ada-link-lib.diff
+++ b/debian/patches/ada-link-lib.diff
@@ -1,15 +1,21 @@
-# DP: - Don't include a runtime link path (-rpath), when linking binaries.
-# DP: - Build the shared libraries on hppa-linux.
-# DP: - Instead of building libada as a target library only, build it as
-# DP:   both a host and, if different, target library.
-
-# Compile with -gnatn, link with --as-needed -z defs.
-
-# Force addition of the build flags from dpkg-buildflags.
-# One day they may be transmitted via *FLAGS_FOR_TARGET,
-# but at least this allows to set noopt for the Ada components.
-
-# Please read ada-changes-in-autogen-output.diff about src/Makefile.def.
+Description: adapt libgnat build for Debian
+ Don't include a runtime link path (-rpath), when linking binaries.
+ .
+ Build the shared libraries on hppa-linux (see #786692 below).
+ TODO: ask the reporter (no porterbox) to attempt a rebuild without this
+ chunk, now that we diverge less from upstream.
+ .
+ Instead of building libada as a target library only, build it as
+ both a host and, if different, target library.
+ .
+ Compile with -gnatn, link with --as-needed -z defs.
+ .
+ Please read ada-changes-in-autogen-output.diff about src/Makefile.def.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=786692
+Forwarded: not-needed
+Author: Ludovic Brenta <lbrenta at debian.org>
+Author: Nicolas Boulenguez <nicolas at debian.org>
+Author: Matthias Klose <doko at debian.org>
 
 --- a/src/gcc/ada/gcc-interface/config-lang.in
 +++ b/src/gcc/ada/gcc-interface/config-lang.in
@@ -52,15 +58,6 @@
  const char *__gnat_object_library_extension = ".a";
 --- a/src/libada/Makefile.in
 +++ b/src/libada/Makefile.in
-@@ -60,7 +60,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
- 	-fexceptions -DIN_RTS @have_getipinfo@
- 
- host_subdir = @host_subdir@
 @@ -78,10 +78,10 @@
  # by recursive make invocations in gcc/ada/Makefile.in
  LIBADA_FLAGS_TO_PASS = \
@@ -74,15 +71,6 @@
          "GNATLIBCFLAGS=$(GNATLIBCFLAGS) $(MULTIFLAGS)" \
          "GNATLIBCFLAGS_FOR_C=$(GNATLIBCFLAGS_FOR_C) $(MULTIFLAGS)" \
          "PICFLAG_FOR_TARGET=$(PICFLAG)" \
-@@ -122,7 +122,7 @@
- 	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons
- 
- install-gnatlib: $(GCC_DIR)/ada/Makefile
--	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib
-+	$(MAKE) -C $(GCC_DIR)/ada $(AM_MAKEFLAGS) $(LIBADA_FLAGS_TO_PASS) install-gnatlib
- 
- # Check uninstalled version.
- check:
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
 @@ -122,7 +122,16 @@
@@ -162,18 +150,6 @@
  ifeq ($(TREECHECKING),)
  CHECKING_ADAFLAGS=
  else
-@@ -58,11 +58,7 @@
- # need to be built by a recent/matching native so we might as well leave the
- # checks fully active.
- 
--ifeq ($(CROSS),)
- ADAFLAGS= $(COMMON_ADAFLAGS) -gnatwns
--else
--ADAFLAGS= $(COMMON_ADAFLAGS)
--endif
- 
- ALL_ADAFLAGS = \
-   $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS) $(CHECKING_ADAFLAGS) $(WARN_ADAFLAGS)
 @@ -211,7 +211,7 @@
  endif
  

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