dev-ada/gprbuild: Fix local patch against a constraint error

Package-Manager: Portage-2.3.8, 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 94973bfceac7bb721f31cd2971eb1cb31ae6ed40..53cc4df8a304840aef30706f26782a18baf1a40f 100644 (file)
--- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
@@ -216,20 +216,17 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu
        make BUILDER="$(BUILDER)" BUILD="$(BUILD)"
 --- gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old     2017-09-12 21:29:25.945747949 +0200
 +++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2017-09-12 21:35:16.299101715 +0200
-@@ -1839,6 +1839,16 @@
-                end;
+@@ -1932,6 +1932,13 @@
+                end if;
              end if;
  
 +            Compiler_Root := First_Compiler_Root;
-+            while Compiler_Root.Next /= null loop
-+               Compiler_Root := Compiler_Root.Next;
-+            end loop;
-+            Compiler_Root.Next :=
++            First_Compiler_Root :=
 +              new Compiler_Root_Data'
 +                (Root => new String'("/usr"),
 +                 Runtimes => null,
-+                 Next => null);
++                 Next => Compiler_Root);
 +
-             --  Now that the compiler roots are in a correct order, add the
-             --  directories corresponding to these compiler roots in the
-             --  project path.
+             --  Reorder the compiler roots in the PATH order
+ 
+             if First_Compiler_Root /= null

diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
index c784920eaf3b85503aac263e0116c7b757fc3725..fb494aeaafcc2d6c7ef7f8519e050276525f6992 100644 (file)
--- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
@@ -21,22 +21,19 @@
  
                          end if;
                       end if;
---- gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old     2017-09-12 21:29:25.945747949 +0200
-+++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2017-09-12 21:35:16.299101715 +0200
-@@ -1839,6 +1839,16 @@
-                end;
+--- gprbuild-17.0/gpr/src/gpr-conf.adb.old     2017-05-17 14:40:26.000000000 +0200
++++ gprbuild-17.0/gpr/src/gpr-conf.adb 2017-11-10 22:44:38.482432592 +0100
+@@ -1932,6 +1932,13 @@
+                end if;
              end if;
  
 +            Compiler_Root := First_Compiler_Root;
-+            while Compiler_Root.Next /= null loop
-+               Compiler_Root := Compiler_Root.Next;
-+            end loop;
-+            Compiler_Root.Next :=
++            First_Compiler_Root :=
 +              new Compiler_Root_Data'
 +                (Root => new String'("/usr"),
 +                 Runtimes => null,
-+                 Next => null);
++                 Next => Compiler_Root);
 +
-             --  Now that the compiler roots are in a correct order, add the
-             --  directories corresponding to these compiler roots in the
-             --  project path.
+             --  Reorder the compiler roots in the PATH order
+ 
+             if First_Compiler_Root /= null