| 1 |
commit: 3eb3db68d752e9a14b070ef95652f4c368b46e65 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 22 07:04:45 2018 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 22 07:04:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb3db68 |
| 7 |
|
| 8 |
dev-ada/langkit: Stable |
| 9 |
|
| 10 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
dev-ada/langkit/files/langkit-2018-gentoo.patch | 49 +++++++++++++++++++++++++ |
| 14 |
dev-ada/langkit/langkit-2018.ebuild | 9 ++--- |
| 15 |
2 files changed, 52 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch |
| 18 |
index 52920e906ee..62ff7ce17e5 100644 |
| 19 |
--- a/dev-ada/langkit/files/langkit-2018-gentoo.patch |
| 20 |
+++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch |
| 21 |
@@ -9,3 +9,52 @@ |
| 22 |
quex_file, |
| 23 |
"-o", "quex_lexer", |
| 24 |
"--buffer-element-size", "4", |
| 25 |
+--- a/langkit/libmanage.py 2018-11-20 21:38:03.042086783 +0100 |
| 26 |
++++ b/langkit/libmanage.py 2018-11-20 21:39:50.562273656 +0100 |
| 27 |
+@@ -682,6 +682,8 @@ |
| 28 |
+ |
| 29 |
+ result = ['-XBUILD_MODE={}'.format(build_mode), |
| 30 |
+ '-XLIBRARY_TYPE={}'.format(library_type), |
| 31 |
++ '-XGPR_BUILD={}'.format(library_type), |
| 32 |
++ '-XGNATCOLL_CORE_BUILD={}'.format(library_type), |
| 33 |
+ '-XXMLADA_BUILD={}'.format(library_type)] |
| 34 |
+ |
| 35 |
+ enable_build_warnings = getattr(args, 'enable_build_warnings', False) |
| 36 |
+--- a/testsuite/python_support/utils.py 2018-11-20 21:41:46.156324084 +0100 |
| 37 |
++++ b/testsuite/python_support/utils.py 2018-11-20 21:42:26.049651194 +0100 |
| 38 |
+@@ -203,7 +203,8 @@ |
| 39 |
+ main_sources=', '.join('"{}"'.format(m) for m in ada_main) |
| 40 |
+ )) |
| 41 |
+ run('gprbuild', '-Pgen', '-q', '-p', |
| 42 |
+- '-XLIBRARY_TYPE=relocatable', '-XXMLADA_BUILD=relocatable') |
| 43 |
++ '-XLIBRARY_TYPE=relocatable', '-XGPR_BUILD=relocatable', |
| 44 |
++ '-XXMLADA_BUILD=relocatable') |
| 45 |
+ |
| 46 |
+ for i, m in enumerate(ada_main): |
| 47 |
+ assert m.endswith('.adb') |
| 48 |
+--- a/testsuite/testsuite_support/__init__.py 2018-11-20 21:45:08.828905205 +0100 |
| 49 |
++++ b/testsuite/testsuite_support/__init__.py 2018-11-20 21:46:10.837858988 +0100 |
| 50 |
+@@ -110,7 +110,9 @@ |
| 51 |
+ # Build Langkit_Support so that each testcase does not try to build it |
| 52 |
+ # in parallel. |
| 53 |
+ if not self.global_env['options'].disable_tear_up_builds: |
| 54 |
+- gargs = ['-p', '-P', self.langkit_support_project_file] |
| 55 |
++ gargs = ['-p'] |
| 56 |
++ gargs = gargs + ['-XGPR_BUILD=relocatable'] |
| 57 |
++ gargs = gargs + ['-P', self.langkit_support_project_file] |
| 58 |
+ cargs = ['-cargs', '-O0', '-g'] |
| 59 |
+ if self.coverage_enabled: |
| 60 |
+ gargs.append('--subdirs=gnatcov') |
| 61 |
+--- a/testsuite/testsuite_support/base_driver.py 2018-11-20 22:04:54.199973719 +0100 |
| 62 |
++++ b/testsuite/testsuite_support/base_driver.py 2018-11-20 22:05:26.498436100 +0100 |
| 63 |
+@@ -312,7 +312,9 @@ |
| 64 |
+ |
| 65 |
+ :param str project_file: Project file name. |
| 66 |
+ """ |
| 67 |
+- argv = ['gprbuild', '-P', project_file, '-p'] |
| 68 |
++ argv = ['gprbuild'] |
| 69 |
++ argv = argv + ['-XGPR_BUILD=relocatable'] |
| 70 |
++ argv = argv + ['-P', project_file, '-p'] |
| 71 |
+ cargs = ['-O0', '-g', '-gnata'] |
| 72 |
+ if self.coverage_enabled: |
| 73 |
+ argv.append('--subdirs=gnatcov') |
| 74 |
|
| 75 |
diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild |
| 76 |
index 9bb818cf2e8..3eeaca02add 100644 |
| 77 |
--- a/dev-ada/langkit/langkit-2018.ebuild |
| 78 |
+++ b/dev-ada/langkit/langkit-2018.ebuild |
| 79 |
@@ -1,4 +1,4 @@ |
| 80 |
-# Copyright 1999-2018 Gentoo Foundation |
| 81 |
+# Copyright 1999-2018 Gentoo Authors |
| 82 |
# Distributed under the terms of the GNU General Public License v2 |
| 83 |
|
| 84 |
EAPI=6 |
| 85 |
@@ -16,15 +16,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a |
| 86 |
|
| 87 |
LICENSE="GPL-3" |
| 88 |
SLOT="0" |
| 89 |
-KEYWORDS="~amd64 ~x86" |
| 90 |
+KEYWORDS="amd64 x86" |
| 91 |
IUSE="" |
| 92 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 93 |
|
| 94 |
DEPEND="${PYTHON_DEPS} |
| 95 |
- || ( |
| 96 |
- dev-ada/gnatcoll[gnat_2017,iconv,shared] |
| 97 |
- dev-ada/gnatcoll-bindings[gnat_2018,iconv,shared] |
| 98 |
- ) |
| 99 |
+ dev-ada/gnatcoll-bindings[iconv,shared] |
| 100 |
dev-python/mako |
| 101 |
dev-python/pyyaml |
| 102 |
dev-python/enum34 |
Archives