1 |
commit: 645f42b66db1d9b46138b11bf89dbb5016b511b2 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 29 21:02:10 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 29 21:02:30 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645f42b6 |
7 |
|
8 |
dev-ada/gps: Stable |
9 |
|
10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
dev-ada/gps/files/gps-2018-gentoo.patch | 40 ----------------------- |
14 |
dev-ada/gps/gps-2018.ebuild | 56 +++++++++++++++++++++++---------- |
15 |
2 files changed, 39 insertions(+), 57 deletions(-) |
16 |
|
17 |
diff --git a/dev-ada/gps/files/gps-2018-gentoo.patch b/dev-ada/gps/files/gps-2018-gentoo.patch |
18 |
index 06a080b69d5..6e258bac36a 100644 |
19 |
--- a/dev-ada/gps/files/gps-2018-gentoo.patch |
20 |
+++ b/dev-ada/gps/files/gps-2018-gentoo.patch |
21 |
@@ -75,43 +75,3 @@ |
22 |
<string /> |
23 |
</project_attribute> |
24 |
|
25 |
---- a/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:42:17.618161040 +0200 |
26 |
-+++ b/gnatcoll_extras/gnatcoll_extras.gpr 2018-07-22 14:43:33.973070921 +0200 |
27 |
-@@ -14,6 +14,7 @@ |
28 |
- for Switches ("C") use |
29 |
- ("-g", "-O2") |
30 |
- & Shared.Gtk_Cflags & Shared.Pygobject_Include & Shared.Python_Cflags; |
31 |
-+ for Driver ("C") use External ("CC", "gcc"); |
32 |
- end Compiler; |
33 |
- |
34 |
- end GNATCOLL_Extras; |
35 |
---- a/widgets/widgets.gpr 2018-07-22 21:46:23.907355738 +0200 |
36 |
-+++ b/widgets/widgets.gpr 2018-07-22 21:47:02.673825994 +0200 |
37 |
-@@ -14,6 +14,7 @@ |
38 |
- for Switches ("C") use |
39 |
- ("-g", "-O2") |
40 |
- & Shared.Gtk_Cflags; |
41 |
-+ for Driver ("C") use External ("CC", "gcc"); |
42 |
- end Compiler; |
43 |
- |
44 |
- end Widgets; |
45 |
---- a/common/common.gpr.in 2018-07-25 08:05:45.227060250 +0200 |
46 |
-+++ b/common/common.gpr.in 2018-07-25 08:06:55.067009811 +0200 |
47 |
-@@ -23,6 +23,7 @@ |
48 |
- for Switches ("dynamic_arrays.adb") use No_Checks; |
49 |
- when "Debug" => |
50 |
- end case; |
51 |
-+ for Driver ("C") use External ("CC", "gcc"); |
52 |
- end Compiler; |
53 |
- |
54 |
- package Binder is |
55 |
---- a/shared.gpr.in 2018-07-25 08:11:47.317597391 +0200 |
56 |
-+++ b/shared.gpr.in 2018-07-25 08:10:56.774362671 +0200 |
57 |
-@@ -60,6 +60,7 @@ |
58 |
- ); |
59 |
- for Switches ("C") use Optimize & ("-g", "-O2"); |
60 |
- end case; |
61 |
-+ for Driver ("C") use External ("CC", "gcc"); |
62 |
- end Compiler; |
63 |
- |
64 |
- package Binder is |
65 |
|
66 |
diff --git a/dev-ada/gps/gps-2018.ebuild b/dev-ada/gps/gps-2018.ebuild |
67 |
index 85c357baef7..71560c0907c 100644 |
68 |
--- a/dev-ada/gps/gps-2018.ebuild |
69 |
+++ b/dev-ada/gps/gps-2018.ebuild |
70 |
@@ -3,7 +3,7 @@ |
71 |
|
72 |
EAPI=6 |
73 |
PYTHON_COMPAT=( python2_7 ) |
74 |
-inherit python-single-r1 autotools desktop |
75 |
+inherit python-single-r1 autotools desktop llvm |
76 |
|
77 |
MYP=${PN}-gpl-${PV}-src |
78 |
|
79 |
@@ -16,16 +16,23 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf627c7a4475261f97ceb |
80 |
|
81 |
LICENSE="GPL-3" |
82 |
SLOT="0" |
83 |
-KEYWORDS="~amd64 ~x86" |
84 |
-IUSE="" |
85 |
+KEYWORDS="amd64 x86" |
86 |
+IUSE="gnat_2017 gnat_2018" |
87 |
|
88 |
RDEPEND="${PYTHON_DEPS} |
89 |
- dev-ada/gnatcoll-db[gnatcoll_db2ada,gnatinspect,xref] |
90 |
- dev-ada/gnatcoll-bindings[python] |
91 |
- >=dev-ada/gtkada-2017[gnat_2018] |
92 |
- dev-ada/libadalang[gnat_2018] |
93 |
+ dev-ada/gnatcoll-db[gnat_2017=,gnat_2018,gnatcoll_db2ada,gnatinspect,xref] |
94 |
+ dev-ada/gnatcoll-bindings[gnat_2017=,gnat_2018=,python] |
95 |
+ >=dev-ada/gtkada-2017[gnat_2017=,gnat_2017=] |
96 |
+ dev-ada/libadalang[gnat_2017=,gnat_2018=] |
97 |
dev-libs/gobject-introspection |
98 |
dev-libs/libffi |
99 |
+ gnat_2017? ( sys-devel/llvm:5 ) |
100 |
+ gnat_2018? ( |
101 |
+ || ( |
102 |
+ sys-devel/llvm:6 |
103 |
+ sys-devel/llvm:7 |
104 |
+ ) |
105 |
+ ) |
106 |
sys-devel/clang:= |
107 |
x11-themes/adwaita-icon-theme |
108 |
x11-themes/hicolor-icon-theme |
109 |
@@ -40,31 +47,46 @@ S="${WORKDIR}"/${MYP} |
110 |
|
111 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
112 |
|
113 |
+pkg_setup() { |
114 |
+ if use gnat_2017; then |
115 |
+ GCC_PV=6.3.0 |
116 |
+ LLVM_MAX_SLOT=5 |
117 |
+ else |
118 |
+ GCC_PV=7.3.1 |
119 |
+ LLVM_MAX_SLOT=7 |
120 |
+ fi |
121 |
+ GNATMAKE=gnatmake-${GCC_PV} |
122 |
+ GNATDRV=gnat-${GCC_PV} |
123 |
+ GNATLS=gnatls-${GCC_PV} |
124 |
+ llvm_pkg_setup |
125 |
+} |
126 |
+ |
127 |
src_prepare() { |
128 |
GCC_PV=7.3.1 |
129 |
default |
130 |
sed -i \ |
131 |
- -e "s:@GNATMAKE@:${CHOST}-gnatmake-${GCC_PV}:g" \ |
132 |
- -e "s:@GNAT@:${CHOST}-gnat-${GCC_PV}:g" \ |
133 |
- -e "s:@GNATLS@:${CHOST}-gnatls-${GCC_PV}:g" \ |
134 |
- share/support/core/toolchains.py \ |
135 |
- share/support/core/projects.py \ |
136 |
- || die |
137 |
+ -e "s:@GNATMAKE@:${CHOST}-${GNATMAKE}:g" \ |
138 |
+ -e "s:@GNAT@:${CHOST}-${GNATDRV}:g" \ |
139 |
+ -e "s:@GNATLS@:${CHOST}-${GNATLS}:g" \ |
140 |
+ share/support/core/toolchains.py \ |
141 |
+ share/support/core/projects.py \ |
142 |
+ || die |
143 |
mv "${WORKDIR}"/libadalang-tools-src laltools |
144 |
} |
145 |
|
146 |
src_configure() { |
147 |
econf \ |
148 |
- GNATMAKE=/usr/bin/gnatmake-7.3.1 \ |
149 |
- GNATDRV=/usr/bin/gnat-7.3.1 \ |
150 |
+ GNATMAKE=/usr/bin/${GNATMAKE} \ |
151 |
+ GNATDRV=/usr/bin/${GNATDRV} \ |
152 |
--with-clang=$(llvm-config --libdir) |
153 |
} |
154 |
|
155 |
src_compile() { |
156 |
- CC=/usr/bin/gcc-7.3.1 emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS}" \ |
157 |
+ emake -C gps GPRBUILD_FLAGS="-v ${MAKEOPTS} \ |
158 |
+ -XGPR_BUILD=relocatable" \ |
159 |
Build=Production |
160 |
gprbuild -v -p -Pcli/cli.gpr ${MAKEOPTS} -XLIBRARY_TYPE=relocatable \ |
161 |
- -cargs:Ada ${ADAFLAGS} |
162 |
+ -XGPR_BUILD=relocatable -cargs:Ada ${ADAFLAGS} || die |
163 |
} |
164 |
|
165 |
src_install() { |