diff options
| author |   Tupone Alfredo <tupone@gentoo.org> | 2017-11-14 19:22:26 +0100 |
|---|---|---|
| committer | Tupone Alfredo <tupone@gentoo.org> | 2017-11-14 19:22:26 +0100 |
| commit | 96ae78b9e81026b99a058897ee5306e565e4d4ad (patch) | |
| tree | bef416deddef74377aba6ad18b51a87c2c7343f1 /dev-ada/gprbuild | |
| parent | dev-python/pypy3-bin: Fix generating PatternCompiler pickles (diff) | |
| download | gentoo-96ae78b9e81026b99a058897ee5306e565e4d4ad.tar.gz gentoo-96ae78b9e81026b99a058897ee5306e565e4d4ad.tar.bz2 gentoo-96ae78b9e81026b99a058897ee5306e565e4d4ad.zip | |
dev-ada/gprbuild: Really add /usr/share/gpr in front of the path
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'dev-ada/gprbuild')
| -rw-r--r-- | dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 25 | ||||
| -rw-r--r-- | dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 23 |
2 files changed, 19 insertions, 29 deletions
diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch index 53cc4df8a304..d54c8da00191 100644 --- 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 fb494aeaafcc..57b3bfe213e9 100644 --- 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; |