dev-ada/gprbuild: add /usr to the search path for gpr files

Package-Manager: Portage-2.3.6, Repoman-2.3.1
hanetzer · Sep 12, 2017 · 891b88e · 891b88e
1 parent a75a493
commit 891b88e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 0 deletions.
diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
@@ -214,3 +214,22 @@ 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
+@@ -1839,6 +1839,16 @@
+                end;
+             end if;
+
++            Compiler_Root := First_Compiler_Root;
++            while Compiler_Root.Next /= null loop
++               Compiler_Root := Compiler_Root.Next;
++            end loop;
++            Compiler_Root.Next :=
++              new Compiler_Root_Data'
++                (Root => new String'("/usr"),
++                 Runtimes => null,
++                 Next => null);
++
+             --  Now that the compiler roots are in a correct order, add the
+             --  directories corresponding to these compiler roots in the
+             --  project path.
diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
@@ -21,3 +21,22 @@
 
                          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;
+             end if;
+
++            Compiler_Root := First_Compiler_Root;
++            while Compiler_Root.Next /= null loop
++               Compiler_Root := Compiler_Root.Next;
++            end loop;
++            Compiler_Root.Next :=
++              new Compiler_Root_Data'
++                (Root => new String'("/usr"),
++                 Runtimes => null,
++                 Next => null);
++
+             --  Now that the compiler roots are in a correct order, add the
+             --  directories corresponding to these compiler roots in the
+             --  project path.