diff options
| -rw-r--r-- | dev-ada/gnatcoll-db/files/gnatcoll-db-2018-gentoo.patch | 10 | ||||
| -rw-r--r-- | dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild | 7 |
2 files changed, 2 insertions, 15 deletions
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..b954b8f73271 100644 --- a/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild +++ b/dev-ada/gnatcoll-db/gnatcoll-db-2018.ebuild @@ -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 \ |