diff options
Diffstat (limited to 'dev-ada/gnatcoll-core')
| -rw-r--r-- | dev-ada/gnatcoll-core/Manifest | 4 | ||||
| -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 |
3 files changed, 8 insertions, 18 deletions
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest index 66dea9241c31..8cb80024c715 100644 --- a/dev-ada/gnatcoll-core/Manifest +++ b/dev-ada/gnatcoll-core/Manifest @@ -1,4 +1,4 @@ -AUX gnatcoll-core-2018-gentoo.patch 861 BLAKE2B 3bf6c4310fb02c20b780d7382fd8465774354c6132a0cc413d683fa2a2bdc8b0cc3dde2e7ca99dac8d00a231b002345d3be01e68da5c876f5d34c2f601ffc5c5 SHA512 4f211b71d5da88983d0c111aafc48c12c9486dec854e903f4ad352d61a48c097994aaf5679c42fb8f74a35c35d73ef6c33e814bf6ea391538ab4e3b5d1253368 +AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64 DIST gnatcoll-core-gpl-2018-src.tar.gz 1657129 BLAKE2B 616aef931fb542f4a022c63db53acb0f8b4323e3b948eb7b8b5688c36817b3f52b5f517b969b0560b6492d51a3e59c8350449cbbe7246b5294c45caeead4d9d6 SHA512 bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac -EBUILD gnatcoll-core-2018.ebuild 1675 BLAKE2B 913974fecd9ede02d75193a2fe577a078ad771d53cf04f987ef4b6d036f79d9296e382b44bab0ae8d546b78996a16b4c75d3f42a04516babc2c1b7f5ddc7776a SHA512 422c0ceff9792bf92af4746b108e40f39427bc2904ffcda4df3449a6aa5bffd2e049fb7d84666f68716824566a87e3b990a74233e330bc378fac44ddebd25ba6 +EBUILD gnatcoll-core-2018.ebuild 1657 BLAKE2B 65f2a5a2f354b4582607e90d278099cdc17f9dfa416639e39c095f991b531d01c45256d059b30a9f26c41393c52f6f84d9e91cf8e073b3f6d314f7585334bc1f SHA512 17303963480f1335c29d4af93e2038f128a676a2a62ced9a77cf4434892b1bc94356992f55af24f3dee18f4cc9f5b65c10a799298bcee691a1d84a891cf46881 MISC metadata.xml 1331 BLAKE2B 0227dacfedf39550b497596c95191f5c8524b9aaaaa19dbab296f4e34fe3ff3ea32f4f92a40c16194204661229986ad90a527131d4bb97decf1b6bd59b911884 SHA512 008d3836de7baa71b8d3655e3e7834d68a7ec304345bfda8a715416e46fa5255185336f84f6b75dbf7a85d24afebd0fdb85131b52ce7c655635e09b42bc1907e 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 |