dev-ada/gprbuild: Fix Name_Id constants

Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
index d54c8da00191c222240a47cd48824dc1bb828f11..ddf5a0c3309e316ed5e6546d46b0e99e0b97cfde 100644 (file)
--- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
@@ -225,3 +225,47 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu
        if Gpr_Prj_Path.all /= "" then
           Add_Directories (Self, Gpr_Prj_Path.all);
        end if;
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old    2017-11-19 13:09:18.947527738 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads        2017-11-19 13:10:08.125654595 +0100
+@@ -27,6 +27,8 @@
+    Name_Buffer : String (1 .. 1_000_000);
+    Name_Len    : Natural := 0;
+ 
++   Last_Id     : Name_Id := Name_Id'First;
++
+    procedure Get_Name_String (Id : Name_Id);
+    procedure Get_Name_String (Id : Unit_Name_Type);
+    procedure Get_Name_String (Id : File_Name_Type);
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old    2017-11-19 13:10:27.674316703 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb        2017-11-19 13:14:38.360963627 +0100
+@@ -354,6 +354,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Enter;
+ 
+@@ -427,6 +429,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Find;
+ 
+--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old   2017-11-19 13:12:41.592995718 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb       2017-11-19 13:16:31.980979696 +0100
+@@ -53,6 +53,10 @@
+          return;
+       end if;
+ 
++      if Last_Id = Name_Id'First then
++         Add_Name ("");
++      end if;
++
+       Add_Name ("a");
+       Add_Name ("b");
+       Add_Name ("c");

diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
index 57b3bfe213e94ee5c29b4d4e265dced88222c1b0..79a07a3498870efc617e11ea26d1330a7521834d 100644 (file)
--- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
@@ -32,3 +32,47 @@
        if Gpr_Prj_Path.all /= "" then
           Add_Directories (Self, Gpr_Prj_Path.all);
        end if;
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old    2017-11-19 13:09:18.947527738 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads        2017-11-19 13:10:08.125654595 +0100
+@@ -27,6 +27,8 @@
+    Name_Buffer : String (1 .. 1_000_000);
+    Name_Len    : Natural := 0;
+ 
++   Last_Id     : Name_Id := Name_Id'First;
++
+    procedure Get_Name_String (Id : Name_Id);
+    procedure Get_Name_String (Id : Unit_Name_Type);
+    procedure Get_Name_String (Id : File_Name_Type);
+--- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old    2017-11-19 13:10:27.674316703 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb        2017-11-19 13:14:38.360963627 +0100
+@@ -354,6 +354,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Enter;
+ 
+@@ -427,6 +429,8 @@
+ 
+       Name_Chars.Append (ASCII.NUL);
+ 
++      Last_Id := Name_Entries.Last;
++
+       return Name_Entries.Last;
+    end Name_Find;
+ 
+--- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old   2017-11-19 13:12:41.592995718 +0100
++++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb       2017-11-19 13:16:31.980979696 +0100
+@@ -53,6 +53,10 @@
+          return;
+       end if;
+ 
++      if Last_Id = Name_Id'First then
++         Add_Name ("");
++      end if;
++
+       Add_Name ("a");
+       Add_Name ("b");
+       Add_Name ("c");