| 1 |
commit: feacdf5c7913b66d15914b8ec7200fb9c6ae4cb0 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 20 17:50:37 2018 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 20 17:50:37 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=feacdf5c |
| 7 |
|
| 8 |
dev-ada/gnatcoll-bindings: Stabilize |
| 9 |
|
| 10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
.../files/gnatcoll-bindings-2018-gentoo.patch | 32 ---------------------- |
| 14 |
.../gnatcoll-bindings-2018.ebuild | 17 ++++-------- |
| 15 |
2 files changed, 6 insertions(+), 43 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch b/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 79729c22842..00000000000 |
| 20 |
--- a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-2018-gentoo.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,32 +0,0 @@ |
| 23 |
---- a/gmp/gnatcoll_gmp.gpr 2018-06-18 21:48:15.289991113 +0200 |
| 24 |
-+++ b/gmp/gnatcoll_gmp.gpr 2018-06-18 21:48:46.869507399 +0200 |
| 25 |
-@@ -65,7 +65,7 @@ |
| 26 |
- for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); |
| 27 |
- for Switches ("C") use ("-O2", "-Wunreachable-code"); |
| 28 |
- end case; |
| 29 |
-- |
| 30 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
| 31 |
- end Compiler; |
| 32 |
- |
| 33 |
- package Binder is |
| 34 |
---- a/iconv/gnatcoll_iconv.gpr 2018-10-10 08:24:48.654714484 +0200 |
| 35 |
-+++ b/iconv/gnatcoll_iconv.gpr 2018-10-10 08:24:16.926237733 +0200 |
| 36 |
-@@ -70,7 +70,7 @@ |
| 37 |
- for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); |
| 38 |
- for Switches ("C") use ("-O2", "-Wunreachable-code"); |
| 39 |
- end case; |
| 40 |
-- |
| 41 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
| 42 |
- end Compiler; |
| 43 |
- |
| 44 |
- package Binder is |
| 45 |
---- a/python/gnatcoll_python.gpr 2018-10-10 08:28:04.700481915 +0200 |
| 46 |
-+++ b/python/gnatcoll_python.gpr 2018-10-10 08:27:33.880990030 +0200 |
| 47 |
-@@ -75,6 +75,7 @@ |
| 48 |
- for Switches ("Ada") use ("-O2", "-gnatn", "-gnatwaCJ"); |
| 49 |
- for Switches ("C") use ("-O2", "-Wunreachable-code") & Split(Python_CFLAGS, " "); |
| 50 |
- end case; |
| 51 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
| 52 |
- end Compiler; |
| 53 |
- |
| 54 |
- package Binder is |
| 55 |
|
| 56 |
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild |
| 57 |
index 8c6d81608c0..5d7f13c2235 100644 |
| 58 |
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild |
| 59 |
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2018.ebuild |
| 60 |
@@ -1,4 +1,4 @@ |
| 61 |
-# Copyright 1999-2018 Gentoo Foundation |
| 62 |
+# Copyright 1999-2018 Gentoo Authors |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
EAPI=6 |
| 66 |
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0ce9cfc7a4475261f97ca5 |
| 67 |
|
| 68 |
LICENSE="GPL-3" |
| 69 |
SLOT="0" |
| 70 |
-KEYWORDS="~amd64 ~x86" |
| 71 |
+KEYWORDS="amd64 x86" |
| 72 |
IUSE="gnat_2016 gnat_2017 +gnat_2018 gmp iconv python readline +shared |
| 73 |
static-libs static-pic syslog" |
| 74 |
|
| 75 |
@@ -26,20 +26,14 @@ RDEPEND="python? ( ${PYTHON_DEPS} ) |
| 76 |
DEPEND="${RDEPEND} |
| 77 |
dev-ada/gprbuild[gnat_2016=,gnat_2017=,gnat_2018=]" |
| 78 |
|
| 79 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) !gnat_2016" |
| 80 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 81 |
|
| 82 |
S="${WORKDIR}"/${MYP}-src |
| 83 |
|
| 84 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 85 |
- |
| 86 |
src_compile() { |
| 87 |
- if use gnat_2017; then |
| 88 |
- GCC_VER=6.3.0 |
| 89 |
- else |
| 90 |
- GCC_VER=7.3.1 |
| 91 |
- fi |
| 92 |
build () { |
| 93 |
- GCC=${CHOST}-gcc-${GCC_VER} gprbuild -j$(makeopts_jobs) -m -p -v \ |
| 94 |
+ gprbuild -j$(makeopts_jobs) -m -p -v \ |
| 95 |
+ -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ |
| 96 |
-XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \ |
| 97 |
-XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \ |
| 98 |
-XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \ |
| 99 |
@@ -61,6 +55,7 @@ src_compile() { |
| 100 |
src_install() { |
| 101 |
build () { |
| 102 |
gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \ |
| 103 |
+ -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ |
| 104 |
-XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2 |
| 105 |
} |
| 106 |
for kind in shared static-libs static-pic ; do |
Archives