Gentoo Archives: gentoo-commits

From: Alfredo Tupone <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ada/gprbuild/files/
Date: Tue, 14 Nov 2017 18:22:55
Message-Id: 1510683746.96ae78b9e81026b99a058897ee5306e565e4d4ad.tupone@gentoo
1 commit: 96ae78b9e81026b99a058897ee5306e565e4d4ad
2 Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 14 18:22:26 2017 +0000
4 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 14 18:22:26 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ae78b9
7
8 dev-ada/gprbuild: Really add /usr/share/gpr in front of the path
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch | 25 +++++++++--------------
13 dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch | 23 ++++++++-------------
14 2 files changed, 19 insertions(+), 29 deletions(-)
15
16 diff --git a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
17 index 53cc4df8a30..d54c8da0019 100644
18 --- a/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
19 +++ b/dev-ada/gprbuild/files/gprbuild-2016-gentoo.patch
20 @@ -214,19 +214,14 @@ diff -Naur gprbuild-gpl-2016-src.old/src/gprinstall-sigint_intercepted.ads gprbu
21
22 package Binder is
23 make BUILDER="$(BUILDER)" BUILD="$(BUILD)"
24 ---- gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb.old 2017-09-12 21:29:25.945747949 +0200
25 -+++ gprbuild-gpl-2016-src/gpr/src/gpr-conf.adb 2017-09-12 21:35:16.299101715 +0200
26 -@@ -1932,6 +1932,13 @@
27 - end if;
28 - end if;
29 -
30 -+ Compiler_Root := First_Compiler_Root;
31 -+ First_Compiler_Root :=
32 -+ new Compiler_Root_Data'
33 -+ (Root => new String'("/usr"),
34 -+ Runtimes => null,
35 -+ Next => Compiler_Root);
36 -+
37 - -- Reorder the compiler roots in the PATH order
38 +--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100
39 ++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100
40 +@@ -1948,6 +1948,8 @@
41 +
42 + end if;
43
44 - if First_Compiler_Root /= null
45 ++ Add_Directories (Self, "/usr/share/gpr");
46 ++
47 + if Gpr_Prj_Path.all /= "" then
48 + Add_Directories (Self, Gpr_Prj_Path.all);
49 + end if;
50
51 diff --git a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
52 index fb494aeaafc..57b3bfe213e 100644
53 --- a/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
54 +++ b/dev-ada/gprbuild/files/gprbuild-2017-gentoo.patch
55 @@ -21,19 +21,14 @@
56
57 end if;
58 end if;
59 ---- gprbuild-17.0/gpr/src/gpr-conf.adb.old 2017-05-17 14:40:26.000000000 +0200
60 -+++ gprbuild-17.0/gpr/src/gpr-conf.adb 2017-11-10 22:44:38.482432592 +0100
61 -@@ -1932,6 +1932,13 @@
62 - end if;
63 - end if;
64 +--- gprbuild-gpl-2016-src/gpr/src/gpr-env.adb.old 2017-11-13 22:16:53.349083426 +0100
65 ++++ gprbuild-gpl-2016-src/gpr/src/gpr-env.adb 2017-11-13 22:17:22.692590351 +0100
66 +@@ -1948,6 +1948,8 @@
67
68 -+ Compiler_Root := First_Compiler_Root;
69 -+ First_Compiler_Root :=
70 -+ new Compiler_Root_Data'
71 -+ (Root => new String'("/usr"),
72 -+ Runtimes => null,
73 -+ Next => Compiler_Root);
74 -+
75 - -- Reorder the compiler roots in the PATH order
76 + end if;
77
78 - if First_Compiler_Root /= null
79 ++ Add_Directories (Self, "/usr/share/gpr");
80 ++
81 + if Gpr_Prj_Path.all /= "" then
82 + Add_Directories (Self, Gpr_Prj_Path.all);
83 + end if;