[gcc-6] 371/401: * Fix suffix'd gnat binary names (Svante Signell). Closes: #814978.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:50:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.
commit d5f29faf23733a28508f95cd7a33c913d6f67572
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sun Feb 5 20:37:06 2017 +0000
* Fix suffix'd gnat binary names (Svante Signell). Closes: #814978.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9285 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 1 +
debian/patches/ada-acats.diff | 18 ++++---
debian/patches/ada-gcc-name.diff | 103 ---------------------------------------
debian/rules.patch | 1 -
4 files changed, 13 insertions(+), 110 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b6492d8..fdd9047 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ gcc-6 (6.3.0-6) UNRELEASED; urgency=medium
* Configure with --enable-default-pie on kfreebsd-* (Steven Chamberlain).
* Configure staged builds with --disable-libmpx (Helmut Grohne).
Closes: #854159.
+ * Fix suffix'd gnat binary names (Svante Signell). Closes: #814978.
-- Matthias Klose <doko at debian.org> Sun, 05 Feb 2017 21:16:42 +0100
diff --git a/debian/patches/ada-acats.diff b/debian/patches/ada-acats.diff
index 83b9acf..1a3cb39 100644
--- a/debian/patches/ada-acats.diff
+++ b/debian/patches/ada-acats.diff
@@ -11,7 +11,7 @@ Index: b/src/gcc/testsuite/ada/acats/run_acats
}
+echo '#!/bin/sh' > host_gnatchop
-+echo exec /usr/bin/gnatchop '$*' >> host_gnatchop
++echo exec /usr/bin/gnatchop --GCC=gcc-6 '$*' >> host_gnatchop
+
+chmod +x host_gnatchop
+
@@ -79,7 +79,13 @@ Index: b/src/gcc/testsuite/ada/acats/run_all.sh
===================================================================
--- a/src/gcc/testsuite/ada/acats/run_all.sh
+++ b/src/gcc/testsuite/ada/acats/run_all.sh
-@@ -12,6 +12,10 @@
+@@ -1,4 +1,5 @@
+ #!/bin/sh
++
+ # Run ACATS with the GNU Ada compiler
+
+ # The following functions are to be customized if you run in cross
+@@ -12,6 +13,10 @@
gccflags="-O2"
gnatflags="-gnatws"
@@ -90,7 +96,7 @@ Index: b/src/gcc/testsuite/ada/acats/run_all.sh
target_run () {
eval $EXPECT -f $testdir/run_test.exp $*
}
-@@ -63,12 +67,15 @@ if [ "$dir" = "$testdir" ]; then
+@@ -63,12 +68,15 @@ if [ "$dir" = "$testdir" ]; then
fi
target_gnatchop () {
@@ -109,7 +115,7 @@ Index: b/src/gcc/testsuite/ada/acats/run_all.sh
}
target_gcc () {
-@@ -101,8 +108,8 @@ display target gcc is $GCC
+@@ -101,8 +109,8 @@ display target gcc is $GCC
display `$GCC -v 2>&1`
display host=`gcc -dumpmachine`
display target=$target
@@ -120,12 +126,12 @@ Index: b/src/gcc/testsuite/ada/acats/run_all.sh
display ""
if [ -n "$GCC_RUNTEST_PARALLELIZE_DIR" ]; then
-@@ -129,7 +136,7 @@ cp $testdir/support/*.ada $testdir/suppo
+@@ -129,7 +137,7 @@ cp $testdir/support/*.ada $testdir/suppo
# Find out the size in bit of an address on the target
target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1
target_run $dir/support/impbit > $dir/support/impbit.out 2>&1
-target_bit=`cat $dir/support/impbit.out`
-+target_bit=`cat $dir/support/impbit.out` | sed -e 's/\r//g'
++target_bit=`cat $dir/support/impbit.out | sed -e 's/ //g' -e 's/\r//g'`
echo target_bit="$target_bit" >> $dir/acats.log
# Find out a suitable asm statement
diff --git a/debian/patches/ada-gcc-name.diff b/debian/patches/ada-gcc-name.diff
deleted file mode 100644
index e031e66..0000000
--- a/debian/patches/ada-gcc-name.diff
+++ /dev/null
@@ -1,103 +0,0 @@
-# DP: use gcc-6 instead of gcc as the command name.
-
-Index: b/src/gcc/ada/gnatlink.adb
-===================================================================
---- a/src/gcc/ada/gnatlink.adb
-+++ b/src/gcc/ada/gnatlink.adb
-@@ -136,7 +136,7 @@ procedure Gnatlink is
- -- This table collects the arguments to be passed to compile the binder
- -- generated file.
-
-- Gcc : String_Access := Program_Name ("gcc", "gnatlink");
-+ Gcc : String_Access := Program_Name ("gcc-6", "gnatlink");
-
- Read_Mode : constant String := "r" & ASCII.NUL;
-
-@@ -1412,7 +1412,8 @@ procedure Gnatlink is
- end if;
-
- Write_Line (" --GCC=comp Use comp as the compiler");
-- Write_Line (" --LINK=nam Use 'nam' for the linking rather than 'gcc'");
-+ Write_Line (" --LINK=nam Use 'nam' for the linking rather " &
-+ "than 'gcc-6'");
- Write_Eol;
- Write_Line (" [non-Ada-objects] list of non Ada object files");
- Write_Line (" [linker-options] other options for the linker");
-Index: b/src/gcc/ada/make.adb
-===================================================================
---- a/src/gcc/ada/make.adb
-+++ b/src/gcc/ada/make.adb
-@@ -667,9 +667,9 @@ package body Make is
- -- Compiler, Binder & Linker Data and Subprograms --
- ----------------------------------------------------
-
-- Gcc : String_Access := Program_Name ("gcc", "gnatmake");
-- Gnatbind : String_Access := Program_Name ("gnatbind", "gnatmake");
-- Gnatlink : String_Access := Program_Name ("gnatlink", "gnatmake");
-+ Gcc : String_Access := Program_Name ("gcc-6", "gnatmake");
-+ Gnatbind : String_Access := Program_Name ("gnatbind-6", "gnatmake");
-+ Gnatlink : String_Access := Program_Name ("gnatlink-6", "gnatmake");
- -- Default compiler, binder, linker programs
-
- Globalizer : constant String := "codepeer_globalizer";
-Index: b/src/gcc/ada/gnatchop.adb
-===================================================================
---- a/src/gcc/ada/gnatchop.adb
-+++ b/src/gcc/ada/gnatchop.adb
-@@ -44,7 +44,7 @@ procedure Gnatchop is
- Config_File_Name : constant String_Access := new String'("gnat.adc");
- -- The name of the file holding the GNAT configuration pragmas
-
-- Gcc : String_Access := new String'("gcc");
-+ Gcc : String_Access := new String'("gcc-6");
- -- May be modified by switch --GCC=
-
- Gcc_Set : Boolean := False;
-Index: b/src/gcc/ada/mdll-utl.adb
-===================================================================
---- a/src/gcc/ada/mdll-utl.adb
-+++ b/src/gcc/ada/mdll-utl.adb
-@@ -39,7 +39,7 @@ package body MDLL.Utl is
- Dlltool_Name : constant String := "dlltool";
- Dlltool_Exec : OS_Lib.String_Access;
-
-- Gcc_Name : constant String := "gcc";
-+ Gcc_Name : constant String := "gcc-6";
- Gcc_Exec : OS_Lib.String_Access;
-
- Gnatbind_Name : constant String := "gnatbind";
-@@ -212,7 +212,7 @@ package body MDLL.Utl is
- end;
- end if;
-
-- Print_Command ("gcc", Arguments (1 .. A));
-+ Print_Command ("gcc-6", Arguments (1 .. A));
-
- OS_Lib.Spawn (Gcc_Exec.all, Arguments (1 .. A), Success);
-
-Index: b/src/gcc/ada/mlib-utl.adb
-===================================================================
---- a/src/gcc/ada/mlib-utl.adb
-+++ b/src/gcc/ada/mlib-utl.adb
-@@ -446,7 +446,7 @@ package body MLib.Utl is
- if Driver_Name = No_Name then
- if Gcc_Exec = null then
- if Gcc_Name = null then
-- Gcc_Name := Osint.Program_Name ("gcc", "gnatmake");
-+ Gcc_Name := Osint.Program_Name ("gcc-6", "gnatmake");
- end if;
-
- Gcc_Exec := Locate_Exec_On_Path (Gcc_Name.all);
-Index: b/src/gcc/ada/prj-makr.adb
-===================================================================
---- a/src/gcc/ada/prj-makr.adb
-+++ b/src/gcc/ada/prj-makr.adb
-@@ -115,7 +115,7 @@ package body Prj.Makr is
-
- procedure Dup2 (Old_Fd, New_Fd : File_Descriptor);
-
-- Gcc : constant String := "gcc";
-+ Gcc : constant String := "gcc-6";
- Gcc_Path : String_Access := null;
-
- Non_Empty_Node : constant Project_Node_Id := 1;
diff --git a/debian/rules.patch b/debian/rules.patch
index 7a9282b..68205c6 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -169,7 +169,6 @@ ifeq (,$(DEB_STAGE))
#ifeq ($(with_ada),yes)
debian_patches += \
ada-driver-check \
- ada-gcc-name \
ada-default-project-path \
ada-library-project-files-soname
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git
More information about the Reproducible-commits
mailing list