diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
| commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
| tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-ada/gnatcoll-bindings | |
| parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) | |
gentoo resync : 24.12.2018
Diffstat (limited to 'dev-ada/gnatcoll-bindings')
| -rw-r--r-- | dev-ada/gnatcoll-bindings/Manifest | 3 | ||||
| -rw-r--r-- | dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch | 32 | ||||
| -rw-r--r-- | dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild | 17 |
3 files changed, 7 insertions, 45 deletions
diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest index 2a3623f00c8b..23c48f2c62dc 100644 --- a/dev-ada/gnatcoll-bindings/Manifest +++ b/dev-ada/gnatcoll-bindings/Manifest @@ -1,4 +1,3 @@ -AUX gnatcoll-bindings-2018-gentoo.patch 1231 BLAKE2B 412d5de713267535d000b6a73a78030a9c1323c8548d4725fe487186c6f4bffd0835e05ebdf9e03a672848096b46065b5deb66d1cb5945fc7ad710a631c9a6c5 SHA512 f0a59191e29353657ddd7f1624512d4eef5e40911275928179d51f08f1466b356bc3702369d48ab7a2d42a8348df65d95392dbfd3b87cde1a66df376b2aa1245 DIST gnatcoll-bindings-gpl-2018-src.tar.gz 100068 BLAKE2B 7e5fe106d421d853135ddaea04b7bf2b306e7d0f054379b4c66b58844ac73270d7c82de549e9440f4ecc672ed7e9df6e2b3c1fea55b67403aaa33b09c124bb9b SHA512 2d42e904ab7324d958b34b103ceb2cf7d9bf620f324578b8d3537c18bcc2b4ba73d553bbec773cde5d57979c3e68bc9eef69f97dd55a3b21e43d464881676295 -EBUILD gnatcoll-bindings-2018.ebuild 2207 BLAKE2B 0eb1b8cdf92c3d37db3bd5d6a9587319530389f2eb6f9abbf4f0a4b42009f7a180d043a401fefc355ccd32d798fb83db7ce74c5ad40f13e70ed46f7b7f54f5dc SHA512 3dfaa068b84de81873cbfa4232bae4070d020c42aa9863785b5630ee3e618cbcbcd1083e668f0a967d6b2cc3d3f7ebe65dbaa6fef478beeea8cd593fb7a96308 +EBUILD gnatcoll-bindings-2018.ebuild 2142 BLAKE2B 8ee5521ae2b74c65a8adff85ae19459c5dfb993184c436d05813236cc8c2bad0b7df87f46e9c1c7efb614020d51cae95f717d0be60fab88229cbfe65d9dc88e9 SHA512 16a17b64f31fbb362c58325efa18da979193befbc642270b240e0b6b36bfe243c1aef67e3b91efba097cb55097ee0b1dadc61bf8faf153d5431a6ceff1d22118 MISC metadata.xml 1317 BLAKE2B 99ea5cb11a8d16c2cde5c902f68f515b2a337d2753453405f2747c72e1d15ba597991ed2bc8d842d1ff127be653d9e59c9e18eec8e034bd5a3bb3726a8ed35a2 SHA512 833bd43bb77645561af5df8ebe904e1b2354ca4be7915aa0fdbe6f6986b116cb8850d91d36bfb1bfd520e037ce93eb206b86488939840e2f64e714f5c1daa083 diff --git a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch b/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch deleted file mode 100644 index 79729c228420..000000000000 --- a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/gmp/gnatcoll_gmp.gpr 2018-06-18 21:48:15.289991113 +0200 -+++ b/gmp/gnatcoll_gmp.gpr 2018-06-18 21:48:46.869507399 +0200 -@@ -65,7 +65,7 @@ - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code"); - end case; -- -+ for Driver ("C") use External ("GCC", "gcc"); - end Compiler; - - package Binder is ---- a/iconv/gnatcoll_iconv.gpr 2018-10-10 08:24:48.654714484 +0200 -+++ b/iconv/gnatcoll_iconv.gpr 2018-10-10 08:24:16.926237733 +0200 -@@ -70,7 +70,7 @@ - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code"); - end case; -- -+ for Driver ("C") use External ("GCC", "gcc"); - end Compiler; - - package Binder is ---- a/python/gnatcoll_python.gpr 2018-10-10 08:28:04.700481915 +0200 -+++ b/python/gnatcoll_python.gpr 2018-10-10 08:27:33.880990030 +0200 -@@ -75,6 +75,7 @@ - for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); - for Switches ("C") use ("-O2", "-Wunreachable-code") & Split(Python_CFLAGS, " "); - end case; -+ for Driver ("C") use External ("GCC", "gcc"); - end Compiler; - - package Binder is diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild index 8c6d81608c04..5d7f13c2235f 100644 --- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild +++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-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 @@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared static-libs static-pic syslog" @@ -26,20 +26,14 @@ RDEPEND="python? ( ${PYTHON_DEPS} ) DEPEND="${RDEPEND} dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) !gnat_2016" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" S="${WORKDIR}"/${MYP}-src -PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) - src_compile() { - if use gnat_2017; then - GCC_VER=6.3.0 - else - GCC_VER=7.3.1 - fi build () { - GCC=${CHOST}-gcc-${GCC_VER} gprbuild -j$(makeopts_jobs) -m -p -v \ + gprbuild -j$(makeopts_jobs) -m -p -v \ + -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ -XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \ -XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \ -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \ @@ -61,6 +55,7 @@ src_compile() { src_install() { build () { gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \ + -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ -XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2 } for kind in shared static-libs static-pic ; do |