summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTupone Alfredo <tupone@gentoo.org>2017-09-12 21:47:23 +0200
committerTupone Alfredo <tupone@gentoo.org>2017-09-12 21:49:50 +0200
commit891b88eb778bfe9b7c3cad47831b95adb610e34e (patch)
tree969eac635db5ae9ec9202241bb2f485c044d1dc0 /dev-ada/gprbuild/files
parentprofiles: drop obsolete cpupower mask (diff)
downloadgentoo-891b88eb778bfe9b7c3cad47831b95adb610e34e.tar.gz
gentoo-891b88eb778bfe9b7c3cad47831b95adb610e34e.tar.bz2
gentoo-891b88eb778bfe9b7c3cad47831b95adb610e34e.zip
dev-ada/gprbuild: add /usr to the search path for gpr files
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'dev-ada/gprbuild/files')
-rw-r--r--dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch19
-rw-r--r--dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch19
2 files changed, 38 insertions, 0 deletions
diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
index f3566e87adbd..94973bfceac7 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 70491e177a77..c784920eaf3b 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.