commit: 891b88eb778bfe9b7c3cad47831b95adb610e34e
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 19:47:23 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Sep 12 19:49:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=891b88eb
dev-ada/gprbuild: add /usr to the search path for gpr files
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 19 +++++++++++++++++++
dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 19 +++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
index f3566e87adb..94973bfceac 100644
--- 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
index 70491e177a7..c784920eaf3 100644
--- 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.
