dev-ada/gprbuild: Really add /usr/share/gpr in front of the path

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 53cc4df8a304840aef30706f26782a18baf1a40f..d54c8da00191c222240a47cd48824dc1bb828f11 100644 (file)
--- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
@@ -214,19 +214,14 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu
  
     package Binder is
        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
-@@ -1932,6 +1932,13 @@
-                end if;
-             end if;
- 
-+            Compiler_Root := First_Compiler_Root;
-+            First_Compiler_Root :=
-+              new Compiler_Root_Data'
-+                (Root => new String'("/usr"),
-+                 Runtimes => null,
-+                 Next => Compiler_Root);
-+
-             --  Reorder the compiler roots in the PATH order
+--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old      2017-11-13 22:16:53.349083426 +0100
++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb  2017-11-13 22:17:22.692590351 +0100
+@@ -1948,6 +1948,8 @@
+ 
+       end if;
  
-             if First_Compiler_Root /= null
++      Add_Directories (Self, "/usr/share/gpr");
++
+       if Gpr_Prj_Path.all /= "" then
+          Add_Directories (Self, Gpr_Prj_Path.all);
+       end if;

diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
index fb494aeaafcc2d6c7ef7f8519e050276525f6992..57b3bfe213e94ee5c29b4d4e265dced88222c1b0 100644 (file)
--- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
@@ -21,19 +21,14 @@
  
                          end if;
                       end if;
---- 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;
+--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old      2017-11-13 22:16:53.349083426 +0100
++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb  2017-11-13 22:17:22.692590351 +0100
+@@ -1948,6 +1948,8 @@
  
-+            Compiler_Root := First_Compiler_Root;
-+            First_Compiler_Root :=
-+              new Compiler_Root_Data'
-+                (Root => new String'("/usr"),
-+                 Runtimes => null,
-+                 Next => Compiler_Root);
-+
-             --  Reorder the compiler roots in the PATH order
+       end if;
  
-             if First_Compiler_Root /= null
++      Add_Directories (Self, "/usr/share/gpr");
++
+       if Gpr_Prj_Path.all /= "" then
+          Add_Directories (Self, Gpr_Prj_Path.all);
+       end if;