diff options
| author |   Tupone Alfredo <tupone@gentoo.org> | 2018-11-20 18:49:12 +0100 |
|---|---|---|
| committer | Tupone Alfredo <tupone@gentoo.org> | 2018-11-20 18:49:12 +0100 |
| commit | cb73be55c4b5055df9c9233766f0f6f0a81d5f8b (patch) | |
| tree | 4702d7d4bc9b2af73ce47f27792217b9c8018cea /dev-ada/gnatcoll-core | |
| parent | net-firewall/iptables: multiple fixes for runscript (diff) | |
| download | gentoo-cb73be55c4b5055df9c9233766f0f6f0a81d5f8b.tar.gz gentoo-cb73be55c4b5055df9c9233766f0f6f0a81d5f8b.tar.bz2 gentoo-cb73be55c4b5055df9c9233766f0f6f0a81d5f8b.zip | |
dev-ada/gnatcoll-core: Stabilize
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'dev-ada/gnatcoll-core')
| -rw-r--r-- | dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch | 10 | ||||
| -rw-r--r-- | dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild | 12 |
2 files changed, 6 insertions, 16 deletions
diff --git a/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch b/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch index cedf710c0363..dcbe89df7837 100644 --- a/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch +++ b/dev-ada/gnatcoll-core/files/gnatcoll-core-2018-gentoo.patch @@ -1,13 +1,3 @@ ---- a/gnatcoll.gpr 2018-06-12 21:37:42.664733336 +0200 -+++ b/gnatcoll.gpr 2018-06-12 21:38:07.965360000 +0200 -@@ -115,6 +115,7 @@ - - for Switches ("gnatcoll_support.c") use - Compiler'Switches ("C") & Extra_Switches; -+ for Driver ("C") use External ("GCC", "gcc"); - - end Compiler; - --- a/src/gnatcoll-projects.ads.old 2017-11-25 14:50:06.919939453 +0100 +++ b/src/gnatcoll-projects.ads 2017-11-25 14:50:38.932387204 +0100 @@ -1917,7 +1917,8 @@ diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild index 88fa2a1f45ac..37d1058f21c9 100644 --- a/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild +++ b/dev-ada/gnatcoll-core/gnatcoll-core-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27a99 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs static-pic" RDEPEND=" @@ -23,14 +23,14 @@ RDEPEND=" DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" -REQUIRED_USE="!gnat_2016" - S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_prepare() { - if use gnat_2017; then + if use gnat_2016; then + GCC_PV=4.9.4 + elif use gnat_2017; then GCC_PV=6.3.0 else GCC_PV=7.3.1 @@ -48,7 +48,7 @@ src_configure() { src_compile() { build () { - GCC=${CHOST}-gcc-${GCC_PV} gprbuild -p -m -j$(makeopts_jobs) \ + gprbuild -p -m -j$(makeopts_jobs) \ -XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \ -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \ gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die |