1 |
commit: 51f0ec98d03d7ec65ee4366ebb4d4c5073be42c6 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 27 20:11:18 2017 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 27 20:11:18 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51f0ec98 |
7 |
|
8 |
dev-ada/gnatcoll: Add use flags gnat_2016 & gnat_2017 |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
11 |
|
12 |
dev-ada/gnatcoll/gnatcoll-2016.ebuild | 40 +++++++++++++++++------------------ |
13 |
dev-ada/gnatcoll/gnatcoll-2017.ebuild | 20 +++++------------- |
14 |
dev-ada/gnatcoll/metadata.xml | 2 ++ |
15 |
3 files changed, 27 insertions(+), 35 deletions(-) |
16 |
|
17 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2016.ebuild b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
18 |
index 0f4d7a0062b..77e71b22795 100644 |
19 |
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
20 |
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild |
21 |
@@ -15,10 +15,11 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5739942ac7a447658d00e1e7 |
22 |
LICENSE="GPL-3" |
23 |
SLOT="0" |
24 |
KEYWORDS="~amd64" |
25 |
-IUSE="gmp gtk iconv postgresql pygobject projects readline +shared sqlite |
26 |
- static syslog" |
27 |
+IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline |
28 |
+ +shared sqlite static syslog" |
29 |
|
30 |
-RDEPEND="dev-lang/gnat-gpl:* |
31 |
+RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 ) |
32 |
+ gnat_2017? ( dev-lang/gnat-gpl:6.3.0 ) |
33 |
${PYTHON_DEPS} |
34 |
gmp? ( dev-libs/gmp:* ) |
35 |
gtk? ( |
36 |
@@ -37,28 +38,16 @@ RDEPEND="dev-lang/gnat-gpl:* |
37 |
=dev-ada/gprbuild-2016[static?,shared?] |
38 |
)" |
39 |
DEPEND="${RDEPEND} |
40 |
- dev-ada/gprbuild" |
41 |
+ dev-ada/gprbuild[gnat_2016=,gnat_2017=]" |
42 |
|
43 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
44 |
- pygobject? ( gtk )" |
45 |
+ pygobject? ( gtk ) |
46 |
+ ^^ ( gnat_2016 gnat_2017 )" |
47 |
|
48 |
S="${WORKDIR}"/${MYP}-src |
49 |
|
50 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
51 |
|
52 |
-pkg_setup() { |
53 |
- GCC=${ADA:-$(tc-getCC)} |
54 |
- GNATMAKE="${GCC/gcc/gnatmake}" |
55 |
- GNATCHOP="${GCC/gcc/gnatchop}" |
56 |
- if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then |
57 |
- eerror "You need a gcc compiler that provides the Ada Compiler:" |
58 |
- eerror "1) use gcc-config to select the right compiler or" |
59 |
- eerror "2) set ADA=gcc-4.9.4 in make.conf" |
60 |
- die "ada compiler not available" |
61 |
- fi |
62 |
- python-single-r1_pkg_setup |
63 |
-} |
64 |
- |
65 |
src_prepare() { |
66 |
default |
67 |
mv configure.{in,ac} || die |
68 |
@@ -66,6 +55,14 @@ src_prepare() { |
69 |
} |
70 |
|
71 |
src_configure() { |
72 |
+ if use gnat_2016; then |
73 |
+ GCC_PV=4.9.4 |
74 |
+ else |
75 |
+ GCC_PV=6.3.0 |
76 |
+ fi |
77 |
+ GCC=${CHOST}-gcc-${GCC_PV} |
78 |
+ GNATMAKE=${CHOST}-gnatmake-${GCC_PV} |
79 |
+ GNATCHOP=${CHOST}-gnatchop-${GCC_PV} |
80 |
if use sqlite; then |
81 |
myConf="--with-sqlite=$(get_libdir)" |
82 |
else |
83 |
@@ -91,15 +88,18 @@ src_configure() { |
84 |
--with-python-exec=${EPYTHON} \ |
85 |
--enable-shared-python \ |
86 |
--disable-pygtk \ |
87 |
+ CC=${GCC} \ |
88 |
$myConf |
89 |
} |
90 |
|
91 |
src_compile() { |
92 |
if use shared; then |
93 |
- emake PROCESSORS=$(makeopts_jobs) build_library_type/relocatable |
94 |
+ emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
95 |
+ build_library_type/relocatable |
96 |
fi |
97 |
if use static; then |
98 |
- emake PROCESSORS=$(makeopts_jobs) build_library_type/static |
99 |
+ emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \ |
100 |
+ build_library_type/static |
101 |
fi |
102 |
python_fix_shebang . |
103 |
} |
104 |
|
105 |
diff --git a/dev-ada/gnatcoll/gnatcoll-2017.ebuild b/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
106 |
index 64a817fd92c..e62932cebe4 100644 |
107 |
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
108 |
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild |
109 |
@@ -18,7 +18,7 @@ KEYWORDS="~amd64" |
110 |
IUSE="gmp gtk iconv postgresql pygobject projects readline +shared sqlite |
111 |
static syslog" |
112 |
|
113 |
-RDEPEND="dev-lang/gnat-gpl:* |
114 |
+RDEPEND="dev-lang/gnat-gpl:6.3.0 |
115 |
${PYTHON_DEPS} |
116 |
gmp? ( dev-libs/gmp:* ) |
117 |
gtk? ( |
118 |
@@ -37,7 +37,7 @@ RDEPEND="dev-lang/gnat-gpl:* |
119 |
>=dev-ada/gprbuild-2017[static?,shared?] |
120 |
)" |
121 |
DEPEND="${RDEPEND} |
122 |
- dev-ada/gprbuild" |
123 |
+ dev-ada/gprbuild[gnat_2017]" |
124 |
|
125 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
126 |
pygobject? ( gtk )" |
127 |
@@ -46,19 +46,6 @@ S="${WORKDIR}"/${MYP}-src |
128 |
|
129 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
130 |
|
131 |
-pkg_setup() { |
132 |
- GCC=${ADA:-$(tc-getCC)} |
133 |
- GNATMAKE="${GCC/gcc/gnatmake}" |
134 |
- GNATCHOP="${GCC/gcc/gnatchop}" |
135 |
- if [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then |
136 |
- eerror "You need a gcc compiler that provides the Ada Compiler:" |
137 |
- eerror "1) use gcc-config to select the right compiler or" |
138 |
- eerror "2) set ADA=gcc-4.9.4 in make.conf" |
139 |
- die "ada compiler not available" |
140 |
- fi |
141 |
- python-single-r1_pkg_setup |
142 |
-} |
143 |
- |
144 |
src_prepare() { |
145 |
default |
146 |
mv configure.{in,ac} || die |
147 |
@@ -66,6 +53,9 @@ src_prepare() { |
148 |
} |
149 |
|
150 |
src_configure() { |
151 |
+ GCC=${CHOST}-gcc-6.3.0 |
152 |
+ GNATMAKE=${CHOST}-gnatmake-6.3.0 |
153 |
+ GNATCHOP=${CHOST}-gnatchop-6.3.0 |
154 |
if use sqlite; then |
155 |
myConf="--with-sqlite=$(get_libdir)" |
156 |
else |
157 |
|
158 |
diff --git a/dev-ada/gnatcoll/metadata.xml b/dev-ada/gnatcoll/metadata.xml |
159 |
index 48cd9149b35..a54b19b4b3c 100644 |
160 |
--- a/dev-ada/gnatcoll/metadata.xml |
161 |
+++ b/dev-ada/gnatcoll/metadata.xml |
162 |
@@ -6,6 +6,8 @@ |
163 |
<name>Tupone Alfredo</name> |
164 |
</maintainer> |
165 |
<use> |
166 |
+ <flag name="gnat_2016">Compile with dev-lang/gnat-gpl-2016</flag> |
167 |
+ <flag name="gnat_2017">Compile with dev-lang/gnat-gpl-2017</flag> |
168 |
<flag name="postgresql">Adds support for postgresql</flag> |
169 |
<flag name="projects">Adds support for projects</flag> |
170 |
<flag name="pygobject">Adds support for pygobject</flag> |