| 1 |
commit: 85ec0821667f4c9b44fab0b3b60dd8c481f3a159 |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 24 21:46:01 2021 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 24 21:46:01 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85ec0821 |
| 7 |
|
| 8 |
dev-ada/libadalang: build examples |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/829871 |
| 11 |
Closes: https://bugs.gentoo.org/829870 |
| 12 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 13 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-ada/libadalang/libadalang-22.0.0.ebuild | 32 ++++++++++++++++++++--------- |
| 16 |
dev-ada/libadalang/metadata.xml | 1 - |
| 17 |
2 files changed, 22 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-ada/libadalang/libadalang-22.0.0.ebuild b/dev-ada/libadalang/libadalang-22.0.0.ebuild |
| 20 |
index 9e708b92291c..5cdedddef0be 100644 |
| 21 |
--- a/dev-ada/libadalang/libadalang-22.0.0.ebuild |
| 22 |
+++ b/dev-ada/libadalang/libadalang-22.0.0.ebuild |
| 23 |
@@ -16,17 +16,16 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz |
| 24 |
LICENSE="GPL-3 gcc-runtime-library-exception-3.1" |
| 25 |
SLOT="0/${PV}" |
| 26 |
KEYWORDS="~amd64" |
| 27 |
-IUSE="test shared +static-libs static-pic" |
| 28 |
-REQUIRED_USE="|| ( shared static-libs static-pic ) |
| 29 |
- ${PYTHON_REQUIRED_USE} |
| 30 |
+IUSE="test +static-libs static-pic" |
| 31 |
+REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 32 |
${ADA_REQUIRED_USE}" |
| 33 |
RESTRICT="!test? ( test )" |
| 34 |
|
| 35 |
RDEPEND="dev-python/pyyaml |
| 36 |
- dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?] |
| 37 |
+ dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared,static-libs?,static-pic?] |
| 38 |
${ADA_DEPS} |
| 39 |
${PYTHON_DEPS} |
| 40 |
- dev-ada/langkit[${ADA_USEDEP},shared?,static-libs?,static-pic?] |
| 41 |
+ dev-ada/langkit[${ADA_USEDEP},shared,static-libs?,static-pic?] |
| 42 |
$(python_gen_cond_dep ' |
| 43 |
dev-ada/langkit[${PYTHON_USEDEP}] |
| 44 |
')" |
| 45 |
@@ -51,12 +50,15 @@ pkg_setup() { |
| 46 |
if use static-pic; then |
| 47 |
libType+=',static-pic' |
| 48 |
fi |
| 49 |
- if use shared; then |
| 50 |
- libType+=',relocatable' |
| 51 |
- fi |
| 52 |
+ libType+=',relocatable' |
| 53 |
libType=${libType:1} |
| 54 |
} |
| 55 |
|
| 56 |
+src_prepare() { |
| 57 |
+ default |
| 58 |
+ rm -r testsuite/tests/misc/copyright || die |
| 59 |
+} |
| 60 |
+ |
| 61 |
src_configure() { |
| 62 |
${EPYTHON} manage.py generate -v debug || die |
| 63 |
} |
| 64 |
@@ -67,11 +69,21 @@ src_compile() { |
| 65 |
-j$(makeopts_jobs) \ |
| 66 |
--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}" \ |
| 67 |
--library-types=${libType} || die |
| 68 |
+ GPR_PROJECT_PATH="${S}"/build \ |
| 69 |
+ gprbuild -P contrib/highlight/highlight.gpr \ |
| 70 |
+ -j$(makeopts_jobs) -v \ |
| 71 |
+ -XBUILD_MODE=prod \ |
| 72 |
+ -XLIBRARY_TYPE=relocatable \ |
| 73 |
+ -XXMLADA_BUILD=relocatable \ |
| 74 |
+ -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \ |
| 75 |
+ || die |
| 76 |
} |
| 77 |
|
| 78 |
src_test() { |
| 79 |
- ${EPYTHON} manage.py test --restricted-env -j 1 |
| 80 |
- ${EPYTHON} manage.py test --restricted-env -j 1 |& tee libadalang.testOut |
| 81 |
+ ${EPYTHON} manage.py test \ |
| 82 |
+ --build-mode "prod" \ |
| 83 |
+ --restricted-env -j 1 \ |
| 84 |
+ |& tee libadalang.testOut |
| 85 |
grep -qw FAIL libadalang.testOut && die |
| 86 |
} |
| 87 |
|
| 88 |
|
| 89 |
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml |
| 90 |
index 217288dff7b1..7752dcfa6bda 100644 |
| 91 |
--- a/dev-ada/libadalang/metadata.xml |
| 92 |
+++ b/dev-ada/libadalang/metadata.xml |
| 93 |
@@ -5,7 +5,6 @@ |
| 94 |
<email>ada@g.o</email> |
| 95 |
</maintainer> |
| 96 |
<use> |
| 97 |
- <flag name="shared">Build shared library</flag> |
| 98 |
<flag name="static-pic">Build static library with pic code</flag> |
| 99 |
</use> |
| 100 |
<longdescription lang="en"> |
Archives