[gcc-7] 142/354: [ Nicolas Boulenguez ] * Reorganize Ada patches. See #857606 for details.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:43 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 1755d008b0ef1198020cab0ecb3002c197750ed2
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Tue Mar 14 12:50:18 2017 +0000
[ Nicolas Boulenguez ]
* Reorganize Ada patches. See #857606 for details.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9356 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 7 +-
debian/patches/ada-changes-in-autogen-output.diff | 117 ++++++++++++----------
debian/patches/ada-gnattools-cross.diff | 114 +++++++++++++--------
debian/patches/ada-gnattools-ldflags.diff | 96 ------------------
debian/patches/ada-libgnatvsn.diff | 2 +-
debian/patches/ada-link-lib.diff | 2 +-
debian/patches/ada-link-shlib.diff | 57 -----------
debian/patches/ada-sjlj.diff | 2 +-
debian/patches/bootstrap-no-unneeded-libs.diff | 2 +-
debian/rules.patch | 4 +-
10 files changed, 148 insertions(+), 255 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cc059f8..2c56251 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-gcc-7 (7-20170303-1) UNRELEASED; urgency=medium
+gcc-7 (7-20170314-1) experimental; urgency=medium
+
+ * GCC 7 snapshot build, taken from the trunk 20170314.
[ Matthias Klose ]
* Bump binutils version requirement to 2.28.
@@ -16,8 +18,9 @@ gcc-7 (7-20170303-1) UNRELEASED; urgency=medium
* Install gnatvsn.gpr project into /u/s/gpr instead of
/u/s/ada/adainclude. Debian is migrating to GPRbuild's upstream layout.
* Avoid hardcoding the version in the ada-gcc-name patch.
+ * Reorganize Ada patches. See #857606 for details.
- -- Matthias Klose <doko at debian.org> Mon, 13 Mar 2017 13:22:48 +0100
+ -- Matthias Klose <doko at debian.org> Tue, 14 Mar 2017 10:42:24 +0100
gcc-7 (7-20170302-1) experimental; urgency=medium
diff --git a/debian/patches/ada-changes-in-autogen-output.diff b/debian/patches/ada-changes-in-autogen-output.diff
index 3ae42a8..635ba90 100644
--- a/debian/patches/ada-changes-in-autogen-output.diff
+++ b/debian/patches/ada-changes-in-autogen-output.diff
@@ -1,12 +1,21 @@
-This patch is generated.
-When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
-# quilt push changes-in-autogen-output.diff
+Some patches modify src/Makefile.def or src/Makefile.tpl.
+# grep -l '^--- .*/src/Makefile.[\(def\)\(tpl\)]' debian/patches/*.diff
+
+Ideally, src/Makefile.in should be regenerated with autogen as done
+for autoconf, but we attempt to avoid to Build-Depend: autogen, which
+then Depends: guile by storing the changes in this patch.
+
+Please update it when necessary.
+# export QUILT_PATCHES=debian/patches
+# quilt pop ada-changes-in-autogen-output.diff
+# quilt add src/Makefile.in
# (cd src && autogen Makefile.def)
-# quilt refresh -p ab --no-index --no-timestamps
+# quilt refresh --no-timestamps --no-index -pab
+# quilt push -a
--- a/src/Makefile.in
+++ b/src/Makefile.in
-@@ -999,6 +999,8 @@
+@@ -999,6 +999,8 @@ configure-target: \
maybe-configure-target-zlib \
maybe-configure-target-rda \
maybe-configure-target-libada \
@@ -15,7 +24,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
maybe-configure-target-libgomp \
maybe-configure-target-libitm \
maybe-configure-target-libatomic
-@@ -1165,6 +1167,8 @@
+@@ -1165,6 +1167,8 @@ all-target: maybe-all-target-libffi
all-target: maybe-all-target-zlib
all-target: maybe-all-target-rda
all-target: maybe-all-target-libada
@@ -24,7 +33,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@if target-libgomp-no-bootstrap
all-target: maybe-all-target-libgomp
@endif target-libgomp-no-bootstrap
-@@ -1258,6 +1262,8 @@
+@@ -1258,6 +1262,8 @@ info-target: maybe-info-target-libffi
info-target: maybe-info-target-zlib
info-target: maybe-info-target-rda
info-target: maybe-info-target-libada
@@ -33,7 +42,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
info-target: maybe-info-target-libgomp
info-target: maybe-info-target-libitm
info-target: maybe-info-target-libatomic
-@@ -1344,6 +1350,8 @@
+@@ -1344,6 +1350,8 @@ dvi-target: maybe-dvi-target-libffi
dvi-target: maybe-dvi-target-zlib
dvi-target: maybe-dvi-target-rda
dvi-target: maybe-dvi-target-libada
@@ -42,7 +51,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
dvi-target: maybe-dvi-target-libgomp
dvi-target: maybe-dvi-target-libitm
dvi-target: maybe-dvi-target-libatomic
-@@ -1430,6 +1438,8 @@
+@@ -1430,6 +1438,8 @@ pdf-target: maybe-pdf-target-libffi
pdf-target: maybe-pdf-target-zlib
pdf-target: maybe-pdf-target-rda
pdf-target: maybe-pdf-target-libada
@@ -51,7 +60,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
pdf-target: maybe-pdf-target-libgomp
pdf-target: maybe-pdf-target-libitm
pdf-target: maybe-pdf-target-libatomic
-@@ -1516,6 +1526,8 @@
+@@ -1516,6 +1526,8 @@ html-target: maybe-html-target-libffi
html-target: maybe-html-target-zlib
html-target: maybe-html-target-rda
html-target: maybe-html-target-libada
@@ -60,7 +69,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
html-target: maybe-html-target-libgomp
html-target: maybe-html-target-libitm
html-target: maybe-html-target-libatomic
-@@ -1602,6 +1614,8 @@
+@@ -1602,6 +1614,8 @@ TAGS-target: maybe-TAGS-target-libffi
TAGS-target: maybe-TAGS-target-zlib
TAGS-target: maybe-TAGS-target-rda
TAGS-target: maybe-TAGS-target-libada
@@ -69,7 +78,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
TAGS-target: maybe-TAGS-target-libgomp
TAGS-target: maybe-TAGS-target-libitm
TAGS-target: maybe-TAGS-target-libatomic
-@@ -1688,6 +1702,8 @@
+@@ -1688,6 +1702,8 @@ install-info-target: maybe-install-info-
install-info-target: maybe-install-info-target-zlib
install-info-target: maybe-install-info-target-rda
install-info-target: maybe-install-info-target-libada
@@ -78,7 +87,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
install-info-target: maybe-install-info-target-libgomp
install-info-target: maybe-install-info-target-libitm
install-info-target: maybe-install-info-target-libatomic
-@@ -1774,6 +1790,8 @@
+@@ -1774,6 +1790,8 @@ install-pdf-target: maybe-install-pdf-ta
install-pdf-target: maybe-install-pdf-target-zlib
install-pdf-target: maybe-install-pdf-target-rda
install-pdf-target: maybe-install-pdf-target-libada
@@ -87,7 +96,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
install-pdf-target: maybe-install-pdf-target-libgomp
install-pdf-target: maybe-install-pdf-target-libitm
install-pdf-target: maybe-install-pdf-target-libatomic
-@@ -1860,6 +1878,8 @@
+@@ -1860,6 +1878,8 @@ install-html-target: maybe-install-html-
install-html-target: maybe-install-html-target-zlib
install-html-target: maybe-install-html-target-rda
install-html-target: maybe-install-html-target-libada
@@ -96,7 +105,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
install-html-target: maybe-install-html-target-libgomp
install-html-target: maybe-install-html-target-libitm
install-html-target: maybe-install-html-target-libatomic
-@@ -1946,6 +1966,8 @@
+@@ -1946,6 +1966,8 @@ installcheck-target: maybe-installcheck-
installcheck-target: maybe-installcheck-target-zlib
installcheck-target: maybe-installcheck-target-rda
installcheck-target: maybe-installcheck-target-libada
@@ -105,7 +114,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
installcheck-target: maybe-installcheck-target-libgomp
installcheck-target: maybe-installcheck-target-libitm
installcheck-target: maybe-installcheck-target-libatomic
-@@ -2032,6 +2054,8 @@
+@@ -2032,6 +2054,8 @@ mostlyclean-target: maybe-mostlyclean-ta
mostlyclean-target: maybe-mostlyclean-target-zlib
mostlyclean-target: maybe-mostlyclean-target-rda
mostlyclean-target: maybe-mostlyclean-target-libada
@@ -114,7 +123,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
mostlyclean-target: maybe-mostlyclean-target-libgomp
mostlyclean-target: maybe-mostlyclean-target-libitm
mostlyclean-target: maybe-mostlyclean-target-libatomic
-@@ -2118,6 +2142,8 @@
+@@ -2118,6 +2142,8 @@ clean-target: maybe-clean-target-libffi
clean-target: maybe-clean-target-zlib
clean-target: maybe-clean-target-rda
clean-target: maybe-clean-target-libada
@@ -123,7 +132,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
clean-target: maybe-clean-target-libgomp
clean-target: maybe-clean-target-libitm
clean-target: maybe-clean-target-libatomic
-@@ -2204,6 +2230,8 @@
+@@ -2204,6 +2230,8 @@ distclean-target: maybe-distclean-target
distclean-target: maybe-distclean-target-zlib
distclean-target: maybe-distclean-target-rda
distclean-target: maybe-distclean-target-libada
@@ -132,7 +141,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
distclean-target: maybe-distclean-target-libgomp
distclean-target: maybe-distclean-target-libitm
distclean-target: maybe-distclean-target-libatomic
-@@ -2290,6 +2318,8 @@
+@@ -2290,6 +2318,8 @@ maintainer-clean-target: maybe-maintaine
maintainer-clean-target: maybe-maintainer-clean-target-zlib
maintainer-clean-target: maybe-maintainer-clean-target-rda
maintainer-clean-target: maybe-maintainer-clean-target-libada
@@ -141,7 +150,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
maintainer-clean-target: maybe-maintainer-clean-target-libgomp
maintainer-clean-target: maybe-maintainer-clean-target-libitm
maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2432,6 +2462,8 @@
+@@ -2432,6 +2462,8 @@ check-target: \
maybe-check-target-zlib \
maybe-check-target-rda \
maybe-check-target-libada \
@@ -150,7 +159,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
maybe-check-target-libgomp \
maybe-check-target-libitm \
maybe-check-target-libatomic
-@@ -2614,6 +2646,8 @@
+@@ -2614,6 +2646,8 @@ install-target: \
maybe-install-target-zlib \
maybe-install-target-rda \
maybe-install-target-libada \
@@ -159,7 +168,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
maybe-install-target-libgomp \
maybe-install-target-libitm \
maybe-install-target-libatomic
-@@ -2720,6 +2754,8 @@
+@@ -2720,6 +2754,8 @@ install-strip-target: \
maybe-install-strip-target-zlib \
maybe-install-strip-target-rda \
maybe-install-strip-target-libada \
@@ -168,7 +177,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
maybe-install-strip-target-libgomp \
maybe-install-strip-target-libitm \
maybe-install-strip-target-libatomic
-@@ -33908,12 +33944,6 @@
+@@ -33908,12 +33944,6 @@ maybe-check-gnattools:
maybe-check-gnattools: check-gnattools
check-gnattools:
@@ -181,7 +190,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -33954,24 +33984,8 @@
+@@ -33954,24 +33984,8 @@ maybe-info-gnattools:
@if gnattools
maybe-info-gnattools: info-gnattools
@@ -208,7 +217,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -33980,24 +33994,8 @@
+@@ -33980,24 +33994,8 @@ maybe-dvi-gnattools:
@if gnattools
maybe-dvi-gnattools: dvi-gnattools
@@ -235,7 +244,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -34006,24 +34004,8 @@
+@@ -34006,24 +34004,8 @@ maybe-pdf-gnattools:
@if gnattools
maybe-pdf-gnattools: pdf-gnattools
@@ -262,7 +271,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -34032,24 +34014,8 @@
+@@ -34032,24 +34014,8 @@ maybe-html-gnattools:
@if gnattools
maybe-html-gnattools: html-gnattools
@@ -289,7 +298,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -34058,24 +34024,8 @@
+@@ -34058,24 +34024,8 @@ maybe-TAGS-gnattools:
@if gnattools
maybe-TAGS-gnattools: TAGS-gnattools
@@ -316,7 +325,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -34084,25 +34034,8 @@
+@@ -34084,25 +34034,8 @@ maybe-install-info-gnattools:
@if gnattools
maybe-install-info-gnattools: install-info-gnattools
@@ -344,7 +353,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -34111,25 +34044,8 @@
+@@ -34111,25 +34044,8 @@ maybe-install-pdf-gnattools:
@if gnattools
maybe-install-pdf-gnattools: install-pdf-gnattools
@@ -372,7 +381,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -34138,25 +34054,8 @@
+@@ -34138,25 +34054,8 @@ maybe-install-html-gnattools:
@if gnattools
maybe-install-html-gnattools: install-html-gnattools
@@ -400,7 +409,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -34165,24 +34064,8 @@
+@@ -34165,24 +34064,8 @@ maybe-installcheck-gnattools:
@if gnattools
maybe-installcheck-gnattools: installcheck-gnattools
@@ -427,7 +436,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif gnattools
-@@ -49313,13 +49196,8 @@
+@@ -49313,13 +49196,8 @@ maybe-check-target-libada:
@if target-libada
maybe-check-target-libada: check-target-libada
@@ -442,7 +451,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif target-libada
-@@ -49328,13 +49206,8 @@
+@@ -49328,13 +49206,8 @@ maybe-install-target-libada:
@if target-libada
maybe-install-target-libada: install-target-libada
@@ -458,7 +467,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif target-libada
-@@ -49343,13 +49216,8 @@
+@@ -49343,13 +49216,8 @@ maybe-install-strip-target-libada:
@if target-libada
maybe-install-strip-target-libada: install-strip-target-libada
@@ -474,7 +483,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
@endif target-libada
-@@ -49360,14 +49228,103 @@
+@@ -49360,14 +49228,103 @@ maybe-info-target-libada:
@if target-libada
maybe-info-target-libada: info-target-libada
@@ -581,7 +590,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
for flag in $(EXTRA_TARGET_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
-@@ -49376,24 +49333,23 @@
+@@ -49376,24 +49333,23 @@ info-target-libada: \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
@@ -612,7 +621,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
for flag in $(EXTRA_TARGET_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
-@@ -49402,24 +49358,23 @@
+@@ -49402,24 +49358,23 @@ dvi-target-libada: \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
@@ -643,7 +652,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
for flag in $(EXTRA_TARGET_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
-@@ -49428,24 +49383,23 @@
+@@ -49428,24 +49383,23 @@ pdf-target-libada: \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
@@ -674,7 +683,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
for flag in $(EXTRA_TARGET_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
-@@ -49454,28 +49408,559 @@
+@@ -49454,28 +49408,559 @@ html-target-libada: \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
@@ -1244,7 +1253,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49483,26 +49968,26 @@
+@@ -49483,26 +49968,26 @@ TAGS-target-libada: \
TAGS) \
|| exit 1
@@ -1282,7 +1291,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49510,26 +49995,26 @@
+@@ -49510,26 +49995,26 @@ install-info-target-libada: \
install-info) \
|| exit 1
@@ -1320,7 +1329,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49537,26 +50022,26 @@
+@@ -49537,26 +50022,26 @@ install-pdf-target-libada: \
install-pdf) \
|| exit 1
@@ -1358,7 +1367,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49564,25 +50049,25 @@
+@@ -49564,25 +50049,25 @@ install-html-target-libada: \
install-html) \
|| exit 1
@@ -1394,7 +1403,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49590,24 +50075,24 @@
+@@ -49590,24 +50075,24 @@ installcheck-target-libada: \
installcheck) \
|| exit 1
@@ -1428,7 +1437,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49615,24 +50100,24 @@
+@@ -49615,24 +50100,24 @@ mostlyclean-target-libada:
mostlyclean) \
|| exit 1
@@ -1462,7 +1471,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49640,24 +50125,24 @@
+@@ -49640,24 +50125,24 @@ clean-target-libada:
clean) \
|| exit 1
@@ -1496,7 +1505,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49665,24 +50150,24 @@
+@@ -49665,24 +50150,24 @@ distclean-target-libada:
distclean) \
|| exit 1
@@ -1530,7 +1539,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
"RANLIB=$${RANLIB}" \
-@@ -49690,7 +50175,7 @@
+@@ -49690,7 +50175,7 @@ maintainer-clean-target-libada:
maintainer-clean) \
|| exit 1
@@ -1539,7 +1548,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
-@@ -54749,6 +55234,8 @@
+@@ -54749,6 +55234,8 @@ configure-target-libffi: stage_last
configure-target-zlib: stage_last
configure-target-rda: stage_last
configure-target-libada: stage_last
@@ -1548,7 +1557,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
configure-stage1-target-libgomp: maybe-all-stage1-gcc
configure-stage2-target-libgomp: maybe-all-stage2-gcc
configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -54784,6 +55271,8 @@
+@@ -54784,6 +55271,8 @@ configure-target-libffi: maybe-all-gcc
configure-target-zlib: maybe-all-gcc
configure-target-rda: maybe-all-gcc
configure-target-libada: maybe-all-gcc
@@ -1557,7 +1566,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
configure-target-libgomp: maybe-all-gcc
configure-target-libitm: maybe-all-gcc
configure-target-libatomic: maybe-all-gcc
-@@ -55239,8 +55728,12 @@
+@@ -55239,8 +55728,12 @@ all-stageprofile-fixincludes: maybe-all-
all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
all-stageautoprofile-fixincludes: maybe-all-stageautoprofile-libiberty
all-stageautofeedback-fixincludes: maybe-all-stageautofeedback-libiberty
@@ -1570,7 +1579,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
all-lto-plugin: maybe-all-libiberty
all-stage1-lto-plugin: maybe-all-stage1-libiberty
-@@ -55937,6 +56430,8 @@
+@@ -55937,6 +56430,8 @@ configure-target-libffi: maybe-all-targe
configure-target-zlib: maybe-all-target-libgcc
configure-target-rda: maybe-all-target-libgcc
configure-target-libada: maybe-all-target-libgcc
@@ -1579,7 +1588,7 @@ When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
configure-target-libgomp: maybe-all-target-libgcc
configure-target-libitm: maybe-all-target-libgcc
configure-target-libatomic: maybe-all-target-libgcc
-@@ -55987,6 +56482,10 @@
+@@ -55987,6 +56482,10 @@ configure-target-rda: maybe-all-target-n
configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
index 0081bef..a45d004 100644
--- a/debian/patches/ada-gnattools-cross.diff
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -5,9 +5,11 @@
# DP: This link will be done by /usr/bin/$(host_alias)-gnat*, thus
# DP: the native gnat with the same major version will be required.
+Index: b/src/gcc/ada/gcc-interface/Makefile.in
+===================================================================
--- a/src/gcc/ada/gcc-interface/Makefile.in
+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ INSTALL_DATA_DATE = cp -p
MAKEINFO = makeinfo
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
@@ -16,7 +18,7 @@
ADA_CFLAGS =
ADAFLAGS = -W -Wall -gnatpg -gnata
FORCE_DEBUG_ADAFLAGS = -g
-@@ -142,6 +142,7 @@
+@@ -141,6 +141,7 @@ target=@target@
target_cpu=@target_cpu@
target_vendor=@target_vendor@
target_os=@target_os@
@@ -24,7 +26,7 @@
host_cpu=@host_cpu@
host_vendor=@host_vendor@
host_os=@host_os@
-@@ -236,7 +237,10 @@
+@@ -235,7 +236,10 @@ ALL_CPPFLAGS = $(CPPFLAGS)
ALL_COMPILERFLAGS = $(ALL_CFLAGS)
# This is where we get libiberty.a from.
@@ -36,7 +38,7 @@
# We need to link against libbacktrace because diagnostic.c in
# libcommon.a uses it.
-@@ -249,8 +253,13 @@
+@@ -248,8 +252,13 @@ LIBDEPS = $(LIBINTL_DEP) $(LIBICONV_DEP)
# Default is no TGT_LIB; one might be passed down or something
TGT_LIB =
TOOLS_LIBS = ../link.o ../targext.o ../../ggc-none.o ../../libcommon-target.a \
@@ -52,7 +54,7 @@
# Add -no-pie to TOOLS_LIBS since some of them are compiled with -fno-PIE.
TOOLS_LIBS += @NO_PIE_FLAG@
-@@ -263,6 +272,9 @@
+@@ -262,6 +271,9 @@ INCLUDES = -iquote . -iquote .. -iquote
-I $(ftop_srcdir)/include $(GMPINC)
ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
@@ -62,11 +64,11 @@
# Likewise, but valid for subdirectories of the current dir.
# FIXME: for VxWorks, we cannot add $(fsrcdir) because the regs.h file in
-@@ -335,6 +347,20 @@
+@@ -334,6 +346,20 @@ GNATMAKE_OBJS = a-except.o ali.o ali-uti
uname.o urealp.o usage.o widechar.o \
$(EXTRA_GNATMAKE_OBJS)
-+# Remove unneeded objects or objects provided by an shared library.
++# Remove unneeded objects or objects provided by a shared library.
+RTS_OBJS := $(patsubst $(RTSDIR)/%.ali,%.o,$(wildcard $(RTSDIR)/*.ali))
+VSN_OBJS := $(patsubst $(VSN_DIR)/%.ali,%.o,$(wildcard $(VSN_DIR)/*.ali))
+GNATLINK_OBJS := $(filter-out $(VSN_OBJS) $(RTS_OBJS) \
@@ -83,7 +85,7 @@
# Make arch match the current multilib so that the RTS selection code
# picks up the right files. For a given target this must be coherent
# with MULTILIB_DIRNAMES defined in gcc/config/target/t-*.
-@@ -437,7 +460,7 @@
+@@ -436,7 +462,7 @@ X86_64_TARGET_PAIRS = \
s-atocou.adb<s-atocou-builtin.adb
# Shared library version
@@ -92,7 +94,7 @@
# Additionnal object files from C source to be added to libgnat.
EXTRA_LIBGNAT_OBJS=
-@@ -1642,6 +1667,11 @@
+@@ -1641,6 +1667,11 @@ ifeq ($(strip $(filter-out s390% linux%,
LIBRARY_VERSION := $(LIB_VERSION)
endif
@@ -104,7 +106,7 @@
# HP/PA HP-UX 10
ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)
LIBGNAT_TARGET_PAIRS = \
-@@ -2517,24 +2547,6 @@
+@@ -2508,24 +2539,6 @@ ADA_EXCLUDE_FILES=$(filter-out \
$(patsubst %$(objext),%.adb,$(GNATRTL_OBJS)), \
$(ADA_EXCLUDE_SRCS))
@@ -129,7 +131,7 @@
GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_INCLUDES) $(LDFLAGS)
# Build directory for the tools. Let's copy the target-dependent
-@@ -2552,95 +2564,36 @@
+@@ -2543,95 +2556,36 @@ GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_
tools/$(word 1,$(subst <, ,$(PAIR)));)
touch ../stamp-tools
@@ -188,31 +190,31 @@
gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
$(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+ $(LDFLAGS) $(TOOLS_LIBS)
$(GNATLINK) -v gnatchop -o ../../gnatchop$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+ $(LDFLAGS) $(TOOLS_LIBS)
$(GNATLINK) -v gnatkr -o ../../gnatkr$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+ $(LDFLAGS) $(TOOLS_LIBS)
$(GNATLINK) -v gnatls -o ../../gnatls$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+ $(LDFLAGS) $(TOOLS_LIBS)
$(GNATLINK) -v gnatprep -o ../../gnatprep$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+ $(LDFLAGS) $(TOOLS_LIBS)
$(GNATLINK) -v gnatxref -o ../../gnatxref$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+ $(LDFLAGS) $(TOOLS_LIBS)
$(GNATLINK) -v gnatfind -o ../../gnatfind$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+ $(LDFLAGS) $(TOOLS_LIBS)
$(GNATLINK) -v gnatname -o ../../gnatname$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+ $(LDFLAGS) $(TOOLS_LIBS)
$(GNATLINK) -v gnatclean -o ../../gnatclean$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-
-../../gnatdll$(exeext): ../stamp-tools
- $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
@@ -235,7 +237,7 @@
# Note the use of the "mv" command in order to allow gnatlink to be linked with
# with the former version of gnatlink itself which cannot override itself.
-@@ -2650,19 +2603,15 @@
+@@ -2641,19 +2595,15 @@ gnatlink-re: ../stamp-tools gnatmake-re
$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink
$(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
@@ -258,8 +260,14 @@
../stamp-gnatlib-$(RTSDIR):
@if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
-@@ -2706,10 +2655,6 @@
- $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
+@@ -2693,14 +2643,10 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+ # Also install the .dSYM directories if they exist (these directories
+ # contain the debug information for the shared libraries on darwin)
+ for file in gnat gnarl; do \
+- if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
+- $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 ]; then \
++ $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
fi; \
- if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
@@ -269,7 +277,7 @@
if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
$(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
-@@ -2722,19 +2667,7 @@
+@@ -2713,20 +2659,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
@@ -286,11 +294,12 @@
- $(RM) ../stamp-gnatlib-$(RTSDIR)
-
-../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
+- $(RMDIR) $(RTSDIR)
+../stamp-gnatlib1-$(RTSDIR): Makefile
- $(RMDIR) $(RTSDIR)
$(MKDIR) $(RTSDIR)
$(CHMOD) u+w $(RTSDIR)
-@@ -2799,7 +2732,7 @@
+ # Copy target independent sources
+@@ -2790,7 +2723,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
$(OSCONS_EXTRACT) ; \
../bldtools/oscons/xoscons s-oscons)
@@ -299,7 +308,7 @@
test -f $(RTSDIR)/s-oscons.ads || exit 1
# C files
$(MAKE) -C $(RTSDIR) \
-@@ -2837,13 +2770,24 @@
+@@ -2828,32 +2761,45 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
# Warning: this target assumes that LIBRARY_VERSION has been set correctly.
gnatlib-shared-default:
@@ -310,6 +319,7 @@
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
+- $(RM) $(RTSDIR)/libgna*$(soext)
+ $(MAKE) -C $(RTSDIR) \
+ CC="`echo \"$(GCC_FOR_TARGET)\" \
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
@@ -328,19 +338,40 @@
+ srcdir=$(fsrcdir) \
+ -f ../Makefile \
+ $(GNATRTL_OBJS)
- $(RM) $(RTSDIR)/libgna*$(soext)
++ $(RM) $(RTSDIR)/libgna*$(soext) $(RTSDIR)/libgna*$(soext).1
+ cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
+ $(PICFLAG_FOR_TARGET) \
+- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 $(LDFLAGS) \
+ $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ $(MISCLIB) -lm
cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
| sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
-@@ -2863,6 +2807,7 @@
- libgnat$(soext)
- cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
- libgnarl$(soext)
+ $(PICFLAG_FOR_TARGET) \
+- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 $(LDFLAGS) \
+ $(GNATRTL_TASKING_OBJS) \
+- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++ $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ $(THREADSLIB)
+- cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+- libgnat$(soext)
+- cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+- libgnarl$(soext)
++ cd $(RTSDIR); for lib in gnat gnarl; do \
++ ls -l *.so*; \
++ l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
++ $(LN_S) $$l.1 $$l; \
++ done
+ $(CHMOD) a-wx $(RTSDIR)/*.ali
# Create static libgnat and libgnarl compiled with -fPIC
$(RM) $(RTSDIR)/libgnat_pic$(arext) $(RTSDIR)/libgnarl_pic$(arext)
-@@ -2882,11 +2827,8 @@
- GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
+@@ -2872,21 +2818,15 @@ gnatlib-shared-dual:
+ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
- gnatlib-shared-default
@@ -353,8 +384,7 @@
$(MAKE) $(FLAGS_TO_PASS) \
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-@@ -2894,10 +2836,7 @@
- GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
+ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
@@ -365,7 +395,7 @@
gnatlib-shared-dual-win32:
$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2907,17 +2846,15 @@
+@@ -2896,17 +2836,15 @@ gnatlib-shared-dual-win32:
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
@@ -386,9 +416,11 @@
# ??? we need to add the option to support auto-import of arrays/records to
# the GNATLIBFLAGS when this will be supported by GNAT. At this point we will
+Index: b/src/gnattools/Makefile.in
+===================================================================
--- a/src/gnattools/Makefile.in
+++ b/src/gnattools/Makefile.in
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ WARN_CFLAGS = @warn_cflags@
ADA_CFLAGS=@ADA_CFLAGS@
# Variables for gnattools.
@@ -397,7 +429,7 @@
# For finding the GCC build dir, which is used far too much
GCC_DIR=../gcc
-@@ -70,28 +70,166 @@
+@@ -70,28 +70,166 @@ INCLUDES_FOR_SUBDIR = -iquote . -iquote
ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
CXX_LFLAGS = \
@@ -487,7 +519,7 @@
+ uname.o urealp.o usage.o widechar.o \
+ $(EXTRA_GNATMAKE_OBJS)
+
-+# Remove unneeded objects or objects provided by an shared library.
++# Remove unneeded objects or objects provided by a shared library.
+RTS_OBJS := $(patsubst $(RTS_DIR)/%.ali,%.o,$(wildcard $(RTS_DIR)/*.ali))
+VSN_OBJS := $(patsubst $(VSN_DIR)/%.ali,%.o,$(wildcard $(VSN_DIR)/*.ali))
+GNATLINK_OBJS := $(filter-out $(VSN_OBJS) $(RTS_OBJS) \
@@ -585,7 +617,7 @@
# Variables for regnattools
TOOLS_FLAGS_TO_PASS_RE= \
-@@ -184,20 +313,11 @@
+@@ -184,20 +322,11 @@ $(GCC_DIR)/stamp-tools:
$(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));)
touch $(GCC_DIR)/stamp-tools
diff --git a/debian/patches/ada-gnattools-ldflags.diff b/debian/patches/ada-gnattools-ldflags.diff
deleted file mode 100644
index 61e51a5..0000000
--- a/debian/patches/ada-gnattools-ldflags.diff
+++ /dev/null
@@ -1,96 +0,0 @@
-# DP: Link gnat tools with the defaults LDFLAGS
-
-Index: b/src/gcc/ada/gcc-interface/Makefile.in
-===================================================================
---- a/src/gcc/ada/gcc-interface/Makefile.in
-+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -112,6 +112,7 @@ NO_SIBLING_ADAFLAGS = -fno-optimize-sibl
- NO_REORDER_ADAFLAGS = -fno-toplevel-reorder
- GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS = -g -O2
-+GNATLIBLDFLAGS = $(LDFLAGS)
- # Pretend that _Unwind_GetIPInfo is available for the target by default. This
- # should be autodetected during the configuration of libada and passed down to
- # here, but we need something for --disable-libada and hope for the best.
-@@ -2603,23 +2604,23 @@ common-tools: ../stamp-tools
- gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
- gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
- $(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
- $(GNATLINK) -v gnatchop -o ../../gnatchop$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
- $(GNATLINK) -v gnatkr -o ../../gnatkr$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
- $(GNATLINK) -v gnatls -o ../../gnatls$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
- $(GNATLINK) -v gnatprep -o ../../gnatprep$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
- $(GNATLINK) -v gnatxref -o ../../gnatxref$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
- $(GNATLINK) -v gnatfind -o ../../gnatfind$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
- $(GNATLINK) -v gnatname -o ../../gnatname$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
- $(GNATLINK) -v gnatclean -o ../../gnatclean$(exeext) \
-- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
-+ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
-
- ../../gnatdll$(exeext): ../stamp-tools
- $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
-@@ -2847,14 +2848,14 @@ gnatlib-shared-default:
- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- $(MISCLIB) -lm
-+ $(MISCLIB) -lm $(GNATLIBLDFLAGS)
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
- $(PICFLAG_FOR_TARGET) \
- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
- $(GNATRTL_TASKING_OBJS) \
- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- $(THREADSLIB)
-+ $(THREADSLIB) $(GNATLIBLDFLAGS)
- cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
- libgnat$(soext)
- cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-@@ -2875,6 +2876,7 @@ gnatlib-shared-dual:
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
-+ GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib-shared-default
-@@ -2886,6 +2888,7 @@ gnatlib-shared-dual:
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
-+ GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
-@@ -2979,6 +2982,7 @@ gnatlib-shared:
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
-+ GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
-@@ -3022,6 +3026,7 @@ gnatlib-zcx:
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
-+ GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
- FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
diff --git a/debian/patches/ada-libgnatvsn.diff b/debian/patches/ada-libgnatvsn.diff
index 37f798b..f08513e 100644
--- a/debian/patches/ada-libgnatvsn.diff
+++ b/debian/patches/ada-libgnatvsn.diff
@@ -3,7 +3,7 @@
# DP: use in GNAT tools, ASIS, GLADE and GPS. Link the gnat tools
# DP: against this new library.
-# !!! src/Makefile.def modified, run autoconf to regenerate src/Makefile.in
+# Please read ada-changes-in-autogen-output.diff about src/Makefile.def.
# !!! Must be applied after ada-link-lib.diff
diff --git a/debian/patches/ada-link-lib.diff b/debian/patches/ada-link-lib.diff
index bcf5777..e7f91e3 100644
--- a/debian/patches/ada-link-lib.diff
+++ b/debian/patches/ada-link-lib.diff
@@ -8,7 +8,7 @@
# DP: recursive makefiles.
# DP: - Link the GNAT tools dynamically.
-# !!! src/Makefile.def modified, run autoconf to regenerate src/Makefile.in
+# Please read ada-changes-in-autogen-output.diff about src/Makefile.def.
--- a/src/gcc/ada/gcc-interface/config-lang.in
+++ b/src/gcc/ada/gcc-interface/config-lang.in
diff --git a/debian/patches/ada-link-shlib.diff b/debian/patches/ada-link-shlib.diff
index 1edad92..b24cb46 100644
--- a/debian/patches/ada-link-shlib.diff
+++ b/debian/patches/ada-link-shlib.diff
@@ -85,60 +85,3 @@
Symbolic_Link_Needed :=
Lib_Dir & Directory_Separator & Lib_Version /= Lib_Path;
end if;
---- a/src/gcc/ada/gcc-interface/Makefile.in
-+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -2652,8 +2652,8 @@
- # Also install the .dSYM directories if they exist (these directories
- # contain the debug information for the shared libraries on darwin)
- for file in gnat gnarl; do \
-- if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
-- $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 ]; then \
-+ $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
- fi; \
- if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
-@@ -2689,7 +2689,6 @@
- cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.ads
-
- ../stamp-gnatlib1-$(RTSDIR): Makefile
-- $(RMDIR) $(RTSDIR)
- $(MKDIR) $(RTSDIR)
- $(CHMOD) u+w $(RTSDIR)
- # Copy target independent sources
-@@ -2809,25 +2808,26 @@
- srcdir=$(fsrcdir) \
- -f ../Makefile \
- $(GNATRTL_OBJS)
-- $(RM) $(RTSDIR)/libgna*$(soext)
-+ $(RM) $(RTSDIR)/libgna*$(soext) $(RTSDIR)/libgna*$(soext).1
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
- $(PICFLAG_FOR_TARGET) \
-- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
-- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- $(MISCLIB) -lm $(GNATLIBLDFLAGS)
- cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
- | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
- $(PICFLAG_FOR_TARGET) \
-- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- $(GNATRTL_TASKING_OBJS) \
-- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+ $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- $(THREADSLIB) $(GNATLIBLDFLAGS)
-- cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- libgnat$(soext)
-- cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-- libgnarl$(soext)
-+ cd $(RTSDIR); for lib in gnat gnarl; do \
-+ ls -l *.so*; \
-+ l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
-+ $(LN_S) $$l.1 $$l; \
-+ done
- $(CHMOD) a-wx $(RTSDIR)/*.ali
-
- # Create static libgnat and libgnarl compiled with -fPIC
diff --git a/debian/patches/ada-sjlj.diff b/debian/patches/ada-sjlj.diff
index a9d7284..d4947b6 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -1,4 +1,4 @@
-# !!! src/Makefile.def modified, run autoconf to regenerate src/Makefile.in
+# Please read ada-changes-in-autogen-output.diff about src/Makefile.def.
# !!! Must be applied after ada-libgnatvsn.diff
diff --git a/debian/patches/bootstrap-no-unneeded-libs.diff b/debian/patches/bootstrap-no-unneeded-libs.diff
index 833d7bc..4939110 100644
--- a/debian/patches/bootstrap-no-unneeded-libs.diff
+++ b/debian/patches/bootstrap-no-unneeded-libs.diff
@@ -1,7 +1,7 @@
# DP: For bootstrap builds, don't build unneeded libstdc++ things
# DP: (debug library, PCH headers).
-# !!! src/Makefile.* modified, run autoconf to regenerate src/Makefile.in
+# Please read ada-changes-in-autogen-output.diff about src/Makefile.[def|tpl].
--- a/src/Makefile.tpl
+++ b/src/Makefile.tpl
diff --git a/debian/rules.patch b/debian/rules.patch
index 581618a..1c80129 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -62,7 +62,6 @@ debian_patches += \
gotools-configury \
pr66368 \
pr67590 \
- ada-gnattools-ldflags \
libjit-ldflags \
PR55947-revert \
libffi-pax \
@@ -276,6 +275,9 @@ endif
# don't remove, this is regularly overwritten, see PR sanitizer/63958.
#debian_patches += libasan-sparc
+# Has to be refreshed manually as described in the header.
+debian_patches += ada-changes-in-autogen-output
+
series_stamp = $(stampdir)/02-series-stamp
series: $(series_stamp)
$(series_stamp):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git
More information about the Reproducible-commits
mailing list