1 |
commit: 32f323a0bb67c3a8db2c686d3b2aad9e265ffa88 |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 20 17:52:12 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 20 17:52:12 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f323a0 |
7 |
|
8 |
dev-ada/gnatcoll-db: Stabilize |
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/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch | 10 ---------- |
14 |
dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild | 7 ++----- |
15 |
2 files changed, 2 insertions(+), 15 deletions(-) |
16 |
|
17 |
diff --git a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch |
18 |
index e6d5119aed4..9d95a9bfc1c 100644 |
19 |
--- a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch |
20 |
+++ b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch |
21 |
@@ -9,13 +9,3 @@ |
22 |
|
23 |
Thread_Lib := (); |
24 |
|
25 |
---- a/postgres/gnatcoll_postgres.gpr 2018-06-24 16:39:56.345322365 +0200 |
26 |
-+++ b/postgres/gnatcoll_postgres.gpr 2018-06-24 16:40:30.737772583 +0200 |
27 |
-@@ -81,6 +81,7 @@ |
28 |
- for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); |
29 |
- for Switches ("C") use ("-O2", "-Wunreachable-code") & PQP_Flag; |
30 |
- end case; |
31 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
32 |
- end Compiler; |
33 |
- |
34 |
- package Binder is |
35 |
|
36 |
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild |
37 |
index 48085f33267..b954b8f7327 100644 |
38 |
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild |
39 |
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild |
40 |
@@ -29,8 +29,7 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=] |
41 |
DEPEND="${RDEPEND} |
42 |
dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" |
43 |
|
44 |
-REQUIRED_USE="!gnat_2016 |
45 |
- gnatinspect? ( xref ) |
46 |
+REQUIRED_USE="gnatinspect? ( xref ) |
47 |
xref? ( sqlite ) |
48 |
sqlite? ( sql ) |
49 |
gnatcoll_db2ada? ( sql )" |
50 |
@@ -40,10 +39,8 @@ S="${WORKDIR}"/${MYP}-src |
51 |
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
52 |
|
53 |
src_compile() { |
54 |
- GCC_PV=7.3.1 |
55 |
build () { |
56 |
- GCC=${CHOST}-gcc-${GCC_PV} \ |
57 |
- GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \ |
58 |
+ GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \ |
59 |
gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \ |
60 |
-XGNATCOLL_VERSION=2018 \ |
61 |
-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \ |