summaryrefslogtreecommitdiff
path: root/dev-ada/gnatcoll-db
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-12-24 14:11:38 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-12-24 14:11:38 +0000
commitde49812990871e1705b64051c35161d5e6400269 (patch)
tree5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-ada/gnatcoll-db
parent536c3711867ec947c1738f2c4b96f22e4863322d (diff)
gentoo resync : 24.12.2018
Diffstat (limited to 'dev-ada/gnatcoll-db')
-rw-r--r--dev-ada/gnatcoll-db/Manifest4
-rw-r--r--dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch10
-rw-r--r--dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild9
3 files changed, 5 insertions, 18 deletions
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index b52ff447e90e..fb72a19daba7 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,4 +1,4 @@
-AUX gnatcoll-db-2018-gentoo.patch 785 BLAKE2B 9136909b36568f624271e3244847702df3b53a86675e819989f32da258ace77d6b96e4a11cd8881a04f4348c44ec287274256909af8e94be3a0d9d95bffa4b9f SHA512 036434974dd482f6945beb23ab857961d6a92feb37b91bbe6f0cad74a1ebec81332cd7df872050720c52c784d6d0cbf9f0d856b832d940e156327093bdacba4d
+AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
DIST gnatcoll-db-gpl-2018-src.tar.gz 2375712 BLAKE2B d5678bdc0993b67d93bdd4cb33ee3ecba15f7cdeead173caaaa08312103505d97099037215a3b0699296aadfa0ef68327f28e01c6229db1fefc5b7d7ebf93187 SHA512 02c967b5951ef0e17e58874e03c9a6252f9c4b28100c9530fb88212e91bc692545f3acc8623477942db220bd54d56b494150b088d05c40f6a24aad8cf6a8f8de
-EBUILD gnatcoll-db-2018.ebuild 2693 BLAKE2B fef5d254fa6c2a9825c4bc80e0de292b6129b2b9bca38ec80860236f2d4976df8ebf39210606b3b694cd74facbf0c1768667fe535983a1bed917c2c708ee8d74 SHA512 bfa5011db3a17d292fe4c0f5867c8066c52762d8d89fdcad1c35429d848271a1348308c0bbdb1399b4a7bf64c605d00ded547cca72b2f20e55ff213d5bda4f2d
+EBUILD gnatcoll-db-2018.ebuild 2633 BLAKE2B 87dd5f392ab6986ba13268ca70c7c873486471c9dd4e62f8160666a149a386249693506c244b02b455f47f033c28325da27c7ca893ca93a7cae4a39a1fa9e8d8 SHA512 5e0885514dc75800d83b444f53d5487b1c0ea3faf04581335f876cd64b2631ba541f76fc5bb1b704190f20c13ba9421e0bd7ac7d0e336654de3e3f16f7de2280
MISC metadata.xml 1519 BLAKE2B 93aa938ca272fb984d08a0471ff339204d0afc854f9fddc4c1f0e060650263c36166e1de91453bdfd52bc0d53844c7042c6f5b14d955b72ab042e6dffadaf4f4 SHA512 27cf0aa52080186fd7970dc02f31eb861ee20edc08366926ea29ec0a826d10c92d80eea840a403fe9be1ccf0be33aaf866f94fe66d351926ffb30104ce143e88
diff --git a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
index e6d5119aed4e..9d95a9bfc1c4 100644
--- a/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
+++ b/dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch
@@ -9,13 +9,3 @@
Thread_Lib := ();
---- a/postgres/gnatcoll_postgres.gpr 2018-06-24 16:39:56.345322365 +0200
-+++ b/postgres/gnatcoll_postgres.gpr 2018-06-24 16:40:30.737772583 +0200
-@@ -81,6 +81,7 @@
- for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ");
- for Switches ("C") use ("-O2", "-Wunreachable-code") & PQP_Flag;
- end case;
-+ for Driver ("C") use External ("GCC", "gcc");
- end Compiler;
-
- package Binder is
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
index 48085f332679..bce7b5b49aef 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cbc7a4475263382be6
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="gnat_2016 gnat_2017 +gnat_2018 gnatcoll_db2ada gnatinspect postgres
+shared sql sqlite static-libs static-pic xref"
@@ -29,8 +29,7 @@ RDEPEND="dev-ada/gnatcoll-core[gnat_2016=,gnat_2017=,gnat_2018=]
DEPEND="${RDEPEND}
dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]"
-REQUIRED_USE="!gnat_2016
- gnatinspect? ( xref )
+REQUIRED_USE="gnatinspect? ( xref )
xref? ( sqlite )
sqlite? ( sql )
gnatcoll_db2ada? ( sql )"
@@ -40,10 +39,8 @@ S="${WORKDIR}"/${MYP}-src
PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
src_compile() {
- GCC_PV=7.3.1
build () {
- GCC=${CHOST}-gcc-${GCC_PV} \
- GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
+ GPR_PROJECT_PATH="${S}/sql":"${S}/sqlite":"${S}/xref" \
gprbuild -p -m -v -j$(makeopts_jobs) -XGNATCOLL_SQLITE=external \
-XGNATCOLL_VERSION=2018 \
-XBUILD=PROD -XLIBRARY_TYPE=$2 -XXMLADA_BUILD=$2 -XGPR_BUILD=$2 \