[gcc-7] 127/354: * Fix the installation directory of the ada-sjlj includes and libraries.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:41 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 ffabf76dd5c4bad57999b46bf254f394aa17caa7
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Mar 2 08:41:18 2017 +0000

      * Fix the installation directory of the ada-sjlj includes and libraries.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9328 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog             |  1 +
 debian/patches/ada-sjlj.diff | 71 +++++++++++++++++++++++---------------------
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d524436..df97397 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ gcc-7 (7-20170301-1) experimental; urgency=medium
   * Build the nvptx offload compilers.
   * Add the newlib copyright, used for the gcc-7-offload-nvptx package.
   * Install the libcp1plugin.
+  * Fix the installation directory of the ada-sjlj includes and libraries.
 
   [ Nicolas Boulenguez ]
   * Use SOURCE_DATE_EPOCH for reproducible ALI timestamps. Closes: #856042.
diff --git a/debian/patches/ada-sjlj.diff b/debian/patches/ada-sjlj.diff
index cb97390..fee6b4c 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -72,8 +72,8 @@ Index: b/src/libada-sjlj/Makefile.in
 +GCC_DIR=$(MULTIBUILDTOP)../../$(host_subdir)/gcc
 +
 +target_noncanonical:=@target_noncanonical@
-+version := $(shell cat $(srcdir)/../gcc/BASE-VER)
-+libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(version)$(MULTISUBDIR)
++gcc_version := $(shell @get_gcc_base_ver@ $(srcdir)/../gcc/BASE-VER)
++libsubdir := $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)$(MULTISUBDIR)
 +ADA_RTS_DIR=$(GCC_DIR)/ada/rts$(subst /,_,$(MULTISUBDIR))
 +ADA_RTS_SUBDIR=./rts$(subst /,_,$(MULTISUBDIR))
 +
@@ -208,7 +208,7 @@ Index: b/src/libada-sjlj/configure.ac
 ===================================================================
 --- /dev/null
 +++ b/src/libada-sjlj/configure.ac
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,152 @@
 +# Configure script for libada.
 +#   Copyright (C) 2003-2016 Free Software Foundation, Inc.
 +#
@@ -337,6 +337,9 @@ Index: b/src/libada-sjlj/configure.ac
 +AC_PROG_AWK
 +AC_PROG_LN_S
 +
++# Determine what GCC version number to use in filesystem paths.
++GCC_BASE_VER
++
 +# Determine what to build for 'gnatlib'
 +if test ${enable_shared} = yes ; then
 +  # Note that build=target is almost certainly the wrong test; FIXME
@@ -362,7 +365,7 @@ Index: b/src/Makefile.def
 ===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -174,6 +174,7 @@ target_modules = { module= libffi; no_in
+@@ -175,6 +175,7 @@ target_modules = { module= libffi; no_in
  target_modules = { module= zlib; };
  target_modules = { module= rda; };
  target_modules = { module= libada; };
@@ -370,7 +373,7 @@ Index: b/src/Makefile.def
  target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
  target_modules = { module= libitm; lib_path=.libs; };
  target_modules = { module= libatomic; lib_path=.libs; };
-@@ -370,6 +371,7 @@ dependencies = { module=all-libcpp; on=a
+@@ -371,6 +372,7 @@ dependencies = { module=all-libcpp; on=a
  dependencies = { module=all-fixincludes; on=all-libiberty; };
  
  dependencies = { module=all-target-libada; on=all-gcc; };
@@ -382,7 +385,7 @@ Index: b/src/configure.ac
 ===================================================================
 --- a/src/configure.ac
 +++ b/src/configure.ac
-@@ -169,6 +169,7 @@ target_libraries="target-libgcc \
+@@ -170,6 +170,7 @@ target_libraries="target-libgcc \
  		target-libffi \
  		target-libobjc \
  		target-libada \
@@ -390,7 +393,7 @@ Index: b/src/configure.ac
  		${target_libiberty} \
  		target-libgo"
  
-@@ -454,7 +455,7 @@ AC_ARG_ENABLE(libada,
+@@ -455,7 +456,7 @@ AC_ARG_ENABLE(libada,
  ENABLE_LIBADA=$enableval,
  ENABLE_LIBADA=yes)
  if test "${ENABLE_LIBADA}" != "yes" ; then
@@ -412,7 +415,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  # Link flags used to build gnat tools.  By default we prefer to statically
  # link with libgcc to avoid a dependency on shared libgcc (which is tricky
-@@ -2706,6 +2706,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2734,6 +2734,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
  	touch ../stamp-gnatlib2-$(RTSDIR)
  	$(RM) ../stamp-gnatlib-$(RTSDIR)
  
@@ -439,7 +442,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  ../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
  	$(RMDIR) $(RTSDIR)
  	$(MKDIR) $(RTSDIR)
-@@ -2970,7 +2990,7 @@ gnatlib-shared:
+@@ -2998,7 +3018,7 @@ gnatlib-shared:
  # commenting the pragma instead of deleting the line, as the latter might
  # result in getting multiple blank lines, hence possible style check errors.
  gnatlib-sjlj:
@@ -448,7 +451,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR)
  	sed \
  	  -e 's/Frontend_Exceptions.*/Frontend_Exceptions       : constant Boolean := True;/' \
-@@ -2979,6 +2999,7 @@ gnatlib-sjlj:
+@@ -3007,6 +3027,7 @@ gnatlib-sjlj:
  	  $(RTSDIR)/system.ads > $(RTSDIR)/s.ads
  	$(MV) $(RTSDIR)/s.ads $(RTSDIR)/system.ads
  	$(MAKE) $(FLAGS_TO_PASS) \
@@ -456,7 +459,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	     EH_MECHANISM="" \
  	     GNATLIBFLAGS="$(GNATLIBFLAGS)" \
  	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-@@ -3031,6 +3052,8 @@ b_gnatm.o : b_gnatm.adb
+@@ -3059,6 +3080,8 @@ b_gnatm.o : b_gnatm.adb
  
  ADA_INCLUDE_DIR = $(libsubdir)/adainclude
  ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
@@ -496,7 +499,7 @@ Index: b/src/Makefile.in
 ===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -1000,6 +1000,7 @@ configure-target:  \
+@@ -999,6 +999,7 @@ configure-target:  \
      maybe-configure-target-zlib \
      maybe-configure-target-rda \
      maybe-configure-target-libada \
@@ -512,7 +515,7 @@ Index: b/src/Makefile.in
  @if target-libgomp-no-bootstrap
  all-target: maybe-all-target-libgomp
  @endif target-libgomp-no-bootstrap
-@@ -1257,6 +1259,7 @@ info-target: maybe-info-target-libffi
+@@ -1258,6 +1260,7 @@ info-target: maybe-info-target-libffi
  info-target: maybe-info-target-zlib
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
@@ -520,7 +523,7 @@ Index: b/src/Makefile.in
  info-target: maybe-info-target-libgomp
  info-target: maybe-info-target-libitm
  info-target: maybe-info-target-libatomic
-@@ -1342,6 +1345,7 @@ dvi-target: maybe-dvi-target-libffi
+@@ -1344,6 +1347,7 @@ dvi-target: maybe-dvi-target-libffi
  dvi-target: maybe-dvi-target-zlib
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
@@ -528,7 +531,7 @@ Index: b/src/Makefile.in
  dvi-target: maybe-dvi-target-libgomp
  dvi-target: maybe-dvi-target-libitm
  dvi-target: maybe-dvi-target-libatomic
-@@ -1427,6 +1431,7 @@ pdf-target: maybe-pdf-target-libffi
+@@ -1430,6 +1434,7 @@ pdf-target: maybe-pdf-target-libffi
  pdf-target: maybe-pdf-target-zlib
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
@@ -536,7 +539,7 @@ Index: b/src/Makefile.in
  pdf-target: maybe-pdf-target-libgomp
  pdf-target: maybe-pdf-target-libitm
  pdf-target: maybe-pdf-target-libatomic
-@@ -1512,6 +1517,7 @@ html-target: maybe-html-target-libffi
+@@ -1516,6 +1521,7 @@ html-target: maybe-html-target-libffi
  html-target: maybe-html-target-zlib
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
@@ -544,7 +547,7 @@ Index: b/src/Makefile.in
  html-target: maybe-html-target-libgomp
  html-target: maybe-html-target-libitm
  html-target: maybe-html-target-libatomic
-@@ -1597,6 +1603,7 @@ TAGS-target: maybe-TAGS-target-libffi
+@@ -1602,6 +1608,7 @@ TAGS-target: maybe-TAGS-target-libffi
  TAGS-target: maybe-TAGS-target-zlib
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
@@ -552,7 +555,7 @@ Index: b/src/Makefile.in
  TAGS-target: maybe-TAGS-target-libgomp
  TAGS-target: maybe-TAGS-target-libitm
  TAGS-target: maybe-TAGS-target-libatomic
-@@ -1682,6 +1689,7 @@ install-info-target: maybe-install-info-
+@@ -1688,6 +1695,7 @@ 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
@@ -560,7 +563,7 @@ Index: b/src/Makefile.in
  install-info-target: maybe-install-info-target-libgomp
  install-info-target: maybe-install-info-target-libitm
  install-info-target: maybe-install-info-target-libatomic
-@@ -1767,6 +1775,7 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1774,6 +1782,7 @@ 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
@@ -568,7 +571,7 @@ Index: b/src/Makefile.in
  install-pdf-target: maybe-install-pdf-target-libgomp
  install-pdf-target: maybe-install-pdf-target-libitm
  install-pdf-target: maybe-install-pdf-target-libatomic
-@@ -1852,6 +1861,7 @@ install-html-target: maybe-install-html-
+@@ -1860,6 +1869,7 @@ 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
@@ -576,7 +579,7 @@ Index: b/src/Makefile.in
  install-html-target: maybe-install-html-target-libgomp
  install-html-target: maybe-install-html-target-libitm
  install-html-target: maybe-install-html-target-libatomic
-@@ -1937,6 +1947,7 @@ installcheck-target: maybe-installcheck-
+@@ -1946,6 +1956,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-zlib
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
@@ -584,7 +587,7 @@ Index: b/src/Makefile.in
  installcheck-target: maybe-installcheck-target-libgomp
  installcheck-target: maybe-installcheck-target-libitm
  installcheck-target: maybe-installcheck-target-libatomic
-@@ -2022,6 +2033,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2032,6 +2043,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-zlib
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
@@ -592,7 +595,7 @@ Index: b/src/Makefile.in
  mostlyclean-target: maybe-mostlyclean-target-libgomp
  mostlyclean-target: maybe-mostlyclean-target-libitm
  mostlyclean-target: maybe-mostlyclean-target-libatomic
-@@ -2107,6 +2119,7 @@ clean-target: maybe-clean-target-libffi
+@@ -2118,6 +2130,7 @@ clean-target: maybe-clean-target-libffi
  clean-target: maybe-clean-target-zlib
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
@@ -600,7 +603,7 @@ Index: b/src/Makefile.in
  clean-target: maybe-clean-target-libgomp
  clean-target: maybe-clean-target-libitm
  clean-target: maybe-clean-target-libatomic
-@@ -2192,6 +2205,7 @@ distclean-target: maybe-distclean-target
+@@ -2204,6 +2217,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-zlib
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
@@ -608,7 +611,7 @@ Index: b/src/Makefile.in
  distclean-target: maybe-distclean-target-libgomp
  distclean-target: maybe-distclean-target-libitm
  distclean-target: maybe-distclean-target-libatomic
-@@ -2277,6 +2291,7 @@ maintainer-clean-target: maybe-maintaine
+@@ -2290,6 +2304,7 @@ 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
@@ -616,7 +619,7 @@ Index: b/src/Makefile.in
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
  maintainer-clean-target: maybe-maintainer-clean-target-libitm
  maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2418,6 +2433,7 @@ check-target:  \
+@@ -2432,6 +2447,7 @@ check-target:  \
      maybe-check-target-zlib \
      maybe-check-target-rda \
      maybe-check-target-libada \
@@ -624,7 +627,7 @@ Index: b/src/Makefile.in
      maybe-check-target-libgomp \
      maybe-check-target-libitm \
      maybe-check-target-libatomic
-@@ -2599,6 +2615,7 @@ install-target:  \
+@@ -2614,6 +2630,7 @@ install-target:  \
      maybe-install-target-zlib \
      maybe-install-target-rda \
      maybe-install-target-libada \
@@ -632,7 +635,7 @@ Index: b/src/Makefile.in
      maybe-install-target-libgomp \
      maybe-install-target-libitm \
      maybe-install-target-libatomic
-@@ -2704,6 +2721,7 @@ install-strip-target:  \
+@@ -2720,6 +2737,7 @@ install-strip-target:  \
      maybe-install-strip-target-zlib \
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
@@ -640,7 +643,7 @@ Index: b/src/Makefile.in
      maybe-install-strip-target-libgomp \
      maybe-install-strip-target-libitm \
      maybe-install-strip-target-libatomic
-@@ -49122,6 +49140,464 @@ maintainer-clean-target-libada:
+@@ -49596,6 +49614,464 @@ maintainer-clean-target-libada:
  
  
  
@@ -1105,7 +1108,7 @@ Index: b/src/Makefile.in
  .PHONY: configure-target-libgomp maybe-configure-target-libgomp
  maybe-configure-target-libgomp:
  @if gcc-bootstrap
-@@ -54166,6 +54642,7 @@ configure-target-libffi: stage_last
+@@ -54649,6 +55125,7 @@ configure-target-libffi: stage_last
  configure-target-zlib: stage_last
  configure-target-rda: stage_last
  configure-target-libada: stage_last
@@ -1113,7 +1116,7 @@ Index: b/src/Makefile.in
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
  configure-stage2-target-libgomp: maybe-all-stage2-gcc
  configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -54200,6 +54677,7 @@ configure-target-libffi: maybe-all-gcc
+@@ -54684,6 +55161,7 @@ configure-target-libffi: maybe-all-gcc
  configure-target-zlib: maybe-all-gcc
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
@@ -1121,7 +1124,7 @@ Index: b/src/Makefile.in
  configure-target-libgomp: maybe-all-gcc
  configure-target-libitm: maybe-all-gcc
  configure-target-libatomic: maybe-all-gcc
-@@ -54656,6 +55134,7 @@ all-stagefeedback-fixincludes: maybe-all
+@@ -55140,6 +55618,7 @@ all-stagefeedback-fixincludes: maybe-all
  all-stageautoprofile-fixincludes: maybe-all-stageautoprofile-libiberty
  all-stageautofeedback-fixincludes: maybe-all-stageautofeedback-libiberty
  all-target-libada: maybe-all-gcc
@@ -1129,7 +1132,7 @@ Index: b/src/Makefile.in
  all-gnattools: maybe-all-target-libada
  all-gnattools: maybe-all-target-libstdc++-v3
  all-lto-plugin: maybe-all-libiberty
-@@ -55353,6 +55832,7 @@ configure-target-libffi: maybe-all-targe
+@@ -55838,6 +56317,7 @@ 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
@@ -1137,7 +1140,7 @@ Index: b/src/Makefile.in
  configure-target-libgomp: maybe-all-target-libgcc
  configure-target-libitm: maybe-all-target-libgcc
  configure-target-libatomic: maybe-all-target-libgcc
-@@ -55401,6 +55881,8 @@ configure-target-rda: maybe-all-target-n
+@@ -55888,6 +56368,8 @@ configure-target-rda: maybe-all-target-n
  
  configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
  

-- 
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