[gcc-6] 395/401: [ Nicolas Boulenguez ] * Reactive the ada-gcc-name patch, calling the versioned gcc.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:50:44 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 12f1425cce59efb82082a952f68b9f1a7b77e175
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Tue Mar 21 10:22:59 2017 +0000
[ Nicolas Boulenguez ]
* Reactive the ada-gcc-name patch, calling the versioned gcc.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@9379 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 4 ++
debian/patches/ada-gcc-name.diff | 128 +++++++++++++++++++++++++++++++++++++++
debian/rules.patch | 1 +
3 files changed, 133 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c48fd3d..3deeb5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
gcc-6 (6.3.0-10) UNRELEASED; urgency=medium
+ [ Matthias Klose ]
* Update the Linaro support to the 6.3-2017.03 snapshot.
+ [ Nicolas Boulenguez ]
+ * Reactive the ada-gcc-name patch, calling the versioned gcc.
+
-- Matthias Klose <doko at debian.org> Fri, 17 Mar 2017 16:20:18 +0100
gcc-6 (6.3.0-9) unstable; urgency=medium
diff --git a/debian/patches/ada-gcc-name.diff b/debian/patches/ada-gcc-name.diff
new file mode 100644
index 0000000..10f48d1
--- /dev/null
+++ b/debian/patches/ada-gcc-name.diff
@@ -0,0 +1,128 @@
+# DP: use gcc-7 instead of gcc as the command name.
+
+--- a/src/gcc/ada/gnatlink.adb
++++ b/src/gcc/ada/gnatlink.adb
+@@ -136,7 +136,8 @@
+ -- 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-" & Gnatvsn.Library_Version, "gnatlink");
+
+ Read_Mode : constant String := "r" & ASCII.NUL;
+
+@@ -1412,7 +1413,8 @@
+ 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-"
++ & Gnatvsn.Library_Version & "'");
+ Write_Eol;
+ Write_Line (" [non-Ada-objects] list of non Ada object files");
+ Write_Line (" [linker-options] other options for the linker");
+--- a/src/gcc/ada/make.adb
++++ b/src/gcc/ada/make.adb
+@@ -667,9 +667,12 @@
+ -- 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-" & Gnatvsn.Library_Version, "gnatmake");
++ Gnatbind : String_Access := Program_Name
++ ("gnatbind-" & Gnatvsn.Library_Version, "gnatmake");
++ Gnatlink : String_Access := Program_Name
++ ("gnatlink-" & Gnatvsn.Library_Version, "gnatmake");
+ -- Default compiler, binder, linker programs
+
+ Globalizer : constant String := "codepeer_globalizer";
+--- a/src/gcc/ada/gnatchop.adb
++++ b/src/gcc/ada/gnatchop.adb
+@@ -36,6 +36,7 @@
+ with GNAT.Heap_Sort_G;
+ with GNAT.Table;
+
++with Gnatvsn;
+ with Switch; use Switch;
+ with Types;
+
+@@ -44,7 +45,7 @@
+ 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-" & Gnatvsn.Library_Version);
+ -- May be modified by switch --GCC=
+
+ Gcc_Set : Boolean := False;
+--- a/src/gcc/ada/mdll-utl.adb
++++ b/src/gcc/ada/mdll-utl.adb
+@@ -29,6 +29,7 @@
+ with Ada.Exceptions;
+
+ with GNAT.Directory_Operations;
++with Gnatvsn;
+ with Osint;
+
+ package body MDLL.Utl is
+@@ -39,7 +40,7 @@
+ Dlltool_Name : constant String := "dlltool";
+ Dlltool_Exec : OS_Lib.String_Access;
+
+- Gcc_Name : constant String := "gcc";
++ Gcc_Name : constant String := "gcc-" & Gnatvsn.Library_Version;
+ Gcc_Exec : OS_Lib.String_Access;
+
+ Gnatbind_Name : constant String := "gnatbind";
+@@ -212,7 +213,7 @@
+ end;
+ end if;
+
+- Print_Command ("gcc", Arguments (1 .. A));
++ Print_Command (Gcc_Name, Arguments (1 .. A));
+
+ OS_Lib.Spawn (Gcc_Exec.all, Arguments (1 .. A), Success);
+
+--- a/src/gcc/ada/mlib-utl.adb
++++ b/src/gcc/ada/mlib-utl.adb
+@@ -23,6 +23,7 @@
+ -- --
+ ------------------------------------------------------------------------------
+
++with Gnatvsn;
+ with MLib.Fil; use MLib.Fil;
+ with MLib.Tgt; use MLib.Tgt;
+ with Opt;
+@@ -446,7 +447,8 @@
+ 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-" & Gnatvsn.Library_Version, "gnatmake");
+ end if;
+
+ Gcc_Exec := Locate_Exec_On_Path (Gcc_Name.all);
+--- a/src/gcc/ada/prj-makr.adb
++++ b/src/gcc/ada/prj-makr.adb
+@@ -24,6 +24,7 @@
+ ------------------------------------------------------------------------------
+
+ with Csets;
++with Gnatvsn;
+ with Makeutl; use Makeutl;
+ with Opt;
+ with Output;
+@@ -115,7 +116,7 @@
+
+ procedure Dup2 (Old_Fd, New_Fd : File_Descriptor);
+
+- Gcc : constant String := "gcc";
++ Gcc : constant String := "gcc-" & Gnatvsn.Library_Version;
+ Gcc_Path : String_Access := null;
+
+ Non_Empty_Node : constant Project_Node_Id := 1;
diff --git a/debian/rules.patch b/debian/rules.patch
index f9b5e53..8f8da23 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -199,6 +199,7 @@ ifeq (,$(DEB_STAGE))
#endif
debian_patches += ada-link-shlib
+ debian_patches += ada-gcc-name
#endif
endif # DEB_STAGE
--
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