Bug#857606: gcc-7: please restore libgnatvsn
Package: src:gcc-7
Followup-For: Bug #857606
With the attachements...
>From 4562c92c5dce6831d75c3b9753cbc19f1351f1a5 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
Date: Mon, 13 Mar 2017 11:37:23 +0100
Subject: [PATCH 15/18] Replace manual -dbg packages with automatic -dbgsym
packages.
---
debian/control.m4 | 38 --------------------------------------
debian/rules.d/binary-ada.mk | 18 +++---------------
2 files changed, 3 insertions(+), 53 deletions(-)
diff --git a/debian/control.m4 b/debian/control.m4
index 44125ce..4912c44 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4632,24 +4632,6 @@ Description: runtime for applications compiled with GNAT (shared library)
.
This package contains the runtime shared library.
-Package: libgnat`'-GNAT_V-dbg`'LS
-Section: debug
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-')`'dnl
-Priority: extra
-Depends: BASELDEP, libgnat`'-GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
-BUILT_USING`'dnl
-Description: runtime for applications compiled with GNAT (debugging symbols)
- GNAT is a compiler for the Ada programming language. It produces optimized
- code on platforms supported by the GNU Compiler Collection (GCC).
- .
- The libgnat library provides runtime components needed by most
- applications produced with GNAT.
- .
- This package contains the debugging symbols.
-
Package: libgnatvsn`'GNAT_V-dev`'LS
Section: libdevel
Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
@@ -4692,26 +4674,6 @@ Description: GNU Ada compiler selected components (shared library)
GPL, allowing to link proprietary programs with it.
.
This package contains the runtime shared library.
-
-Package: libgnatvsn`'GNAT_V-dbg`'LS
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-')`'dnl
-Priority: extra
-Section: debug
-Depends: BASELDEP, libgnatvsn`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
-Suggests: gnat
-BUILT_USING`'dnl
-Description: GNU Ada compiler selected components (debugging symbols)
- GNAT is a compiler for the Ada programming language. It produces optimized
- code on platforms supported by the GNU Compiler Collection (GCC).
- .
- The libgnatvsn library exports selected GNAT components for use in other
- packages, most notably ASIS tools. It is licensed under the GNAT-Modified
- GPL, allowing to link proprietary programs with it.
- .
- This package contains the debugging symbols.
')`'dnl libgnat
ifenabled(`lib64gnat',`
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 242bb9b..54e3fec 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -23,10 +23,8 @@ endif
p_gnat = gnat-$(GNAT_VERSION)$(cross_bin_arch)
p_gnatsjlj= gnat-$(GNAT_VERSION)-sjlj$(cross_bin_arch)
p_lgnat = libgnat-$(GNAT_VERSION)$(cross_lib_arch)
-p_lgnat_dbg = libgnat-$(GNAT_VERSION)-dbg$(cross_lib_arch)
p_lgnatvsn = libgnatvsn$(GNAT_VERSION)$(cross_lib_arch)
p_lgnatvsn_dev = libgnatvsn$(GNAT_VERSION)-dev$(cross_lib_arch)
-p_lgnatvsn_dbg = libgnatvsn$(GNAT_VERSION)-dbg$(cross_lib_arch)
p_gnatd = $(p_gnat)-doc
d_gbase = debian/$(p_gbase)
@@ -106,7 +104,7 @@ $(binary_stamp)-libgnat: $(install_stamp)
b=libgnat; \
v=$(GNAT_VERSION); \
for ext in preinst postinst prerm postrm; do \
- for t in '' -dev -dbg; do \
+ for t in '' -dev; do \
if [ -f debian/$$b$$t.$$ext ]; then \
cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \
fi; \
@@ -121,7 +119,7 @@ ifneq (,$(filter $(build_type), build-native cross-build-native))
$(d_lgnat)/usr/share/lintian/overrides/$(p_lgnat)
endif
- dh_strip -p$(p_lgnat) --dbg-package=$(p_lgnat_dbg)
+ dh_strip -p$(p_lgnat)
$(cross_shlibdeps) dh_shlibdeps -p$(p_lgnat) \
$(call shlibdirs_to_search, \
$(subst gnat-$(GNAT_SONAME),gcc$(GCC_SONAME),$(p_lgnat)) \
@@ -129,11 +127,6 @@ endif
$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
$(call cross_mangle_substvars,$(p_lgnat))
- : # $(p_lgnat_dbg)
- debian/dh_doclink -p$(p_lgnat_dbg) $(p_glbase)
-
- echo $(p_lgnat) $(p_lgnat_dbg) >> debian/$(lib_binaries)
-
trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
$(binary_stamp)-libgnatvsn: $(install_stamp)
@@ -165,7 +158,7 @@ ifneq (,$(filter $(build_type), build-native cross-build-native))
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)
+ dh_strip -p$(p_lgnatvsn)
$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_lgnatvsn) \
-V '$(p_lgnatvsn) (>= $(DEB_VERSION))'
$(call cross_mangle_shlibs,$(p_lgnatvsn))
@@ -178,11 +171,6 @@ endif
$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
$(call cross_mangle_substvars,$(p_lgnatvsn))
- : # $(p_lgnatvsn_dbg)
- debian/dh_doclink -p$(p_lgnatvsn_dbg) $(p_glbase)
-
- echo $(p_lgnatvsn) $(p_lgnatvsn_dev) $(p_lgnatvsn_dbg) >> debian/$(lib_binaries)
-
touch $@
$(binary_stamp)-ada: $(install_stamp)
--
2.11.0
>From beaf2a10b4f3a1bc01266083cf90fbd2d605d3f3 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
Date: Mon, 13 Mar 2017 11:38:50 +0100
Subject: [PATCH 16/18] Typo in ada-gnattools-cross.diff
---
debian/patches/ada-gnattools-cross.diff | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
index 0081bef..f9d1501 100644
--- a/debian/patches/ada-gnattools-cross.diff
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -66,7 +66,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 $(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) \
@@ -487,7 +487,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) \
--
2.11.0
>From fabfabf11dca86b354182c75d65e5c04818c3739 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
Date: Mon, 13 Mar 2017 12:25:04 +0100
Subject: [PATCH 17/18] Merge related patches affecting
src/gcc/ada/gcc-interface/Makefile.in. ada-link-shlib.diff: modifications of
Makefile.in are unrelated with the patch description. Move them into
ada-gnattools-cross.diff. ada-gnattools-ldflags.diff: For the tools, the
added LDFLAGS was a duplicate. The culprint was ada-gnattools-cross.diff,
which later removes GCC_LINK, which contains LDFLAGS. Fix the issue there.
The motivated 2-lines change in libgnat creates many conflicts for very
little gain. Move it too.
---
debian/patches/ada-gnattools-cross.diff | 73 +++++++++++++++--------
debian/patches/ada-gnattools-ldflags.diff | 96 -------------------------------
debian/patches/ada-link-shlib.diff | 57 ------------------
debian/rules.patch | 1 -
4 files changed, 50 insertions(+), 177 deletions(-)
delete mode 100644 debian/patches/ada-gnattools-ldflags.diff
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
index f9d1501..ce1cdac 100644
--- a/debian/patches/ada-gnattools-cross.diff
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -188,31 +188,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)"
@@ -258,8 +258,14 @@
../stamp-gnatlib-$(RTSDIR):
@if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
-@@ -2706,10 +2655,6 @@
- $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
+@@ -2701,14 +2651,10 @@
+ # 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 +275,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 @@
+@@ -2721,20 +2667,7 @@
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
@@ -286,8 +292,8 @@
- $(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 @@
@@ -299,7 +305,7 @@
test -f $(RTSDIR)/s-oscons.ads || exit 1
# C files
$(MAKE) -C $(RTSDIR) \
-@@ -2837,13 +2770,24 @@
+@@ -2836,32 +2769,45 @@
# Warning: this target assumes that LIBRARY_VERSION has been set correctly.
gnatlib-shared-default:
@@ -310,6 +316,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 +335,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)" \
+@@ -2880,21 +2825,15 @@
+ GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
- gnatlib-shared-default
@@ -353,8 +381,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
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-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/rules.patch b/debian/rules.patch
index 581618a..c9b12d9 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 \
--
2.11.0
>From d5b883c80a1e9d8f81ac4cd8905f6a859874f3bd Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nicolas.boulenguez@free.fr>
Date: Mon, 13 Mar 2017 16:51:24 +0100
Subject: [PATCH 18/18] dpkg-source now ignores _MTN and .mtn-ignore by
default.
---
debian/source/local-options | 6 ------
1 file changed, 6 deletions(-)
delete mode 100644 debian/source/local-options
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 3974cf1..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,6 +0,0 @@
-# debian/source/local-options
-# See dpkg-source(1).
-
-tar-ignore = ".mtn-ignore"
-tar-ignore = "_MTN"
-# This file is ignored by default.
--
2.11.0
Reply to: