From: "Alfredo Tupone" <tupone@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
Date: Tue, 14 Nov 2017 18:22:50 +0000 (UTC) [thread overview]
Message-ID: <1510683746.96ae78b9e81026b99a058897ee5306e565e4d4ad.tupone@gentoo> (raw)
commit: 96ae78b9e81026b99a058897ee5306e565e4d4ad
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 14 18:22:26 2017 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 18:22:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ae78b9
dev-ada/gprbuild: Really add /usr/share/gpr in front of the path
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 25 +++++++++--------------
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 53cc4df8a30..d54c8da0019 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 fb494aeaafc..57b3bfe213e 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;
next reply other threads:[~2017-11-14 18:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-14 18:22 Alfredo Tupone [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-15 20:54 [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/ Alfredo Tupone
2023-01-15 10:14 Alfredo Tupone
2022-11-25 17:49 Conrad Kostecki
2020-06-16 20:29 Alfredo Tupone
2018-11-21 21:06 Alfredo Tupone
2018-06-23 18:53 Alfredo Tupone
2017-12-20 7:53 Alfredo Tupone
2017-11-19 13:01 Alfredo Tupone
2017-11-11 17:44 Alfredo Tupone
2017-09-12 19:49 Alfredo Tupone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1510683746.96ae78b9e81026b99a058897ee5306e565e4d4ad.tupone@gentoo \
--to=tupone@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox