[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: bb090ee89faf8a9e25f7376906bfea9b84eaa5a6 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Mar 15 20:51:59 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Mar 15 20:52:33 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb090ee8 dev-ada/langkit: add 24.0.0 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/Manifest | 1 + dev-ada/langkit/langkit-24.0.0.ebuild | 107 ++ 2 files changed, 108 insertions(+) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index 9a010d224369..e1505522fde0 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1 +1,2 @@ DIST langkit-23.0.0.tar.gz 1178557 BLAKE2B c3b81cafea3afcfd90a87192dca5abd0f19c5ff4e195515dd7c4df70824bf328c24855a6761264b89bf44a56afc8dd77b78fbf322c6f92299082507aa65d61e5 SHA512 6cc6adacb157a47ebc8da46591e45a4ff212fba2cd5ac80c12adb2e84f4508735d98dc68ffce86aa5e5e8d873e6f51efb4f88f4d76a190b9eb0024bf69deefc1 +DIST langkit-24.0.0.tar.gz 1282265 BLAKE2B 63aa3eb05be6ea590c3f4d0478cdfa0ee217606607c73b4c172c5b89d8a2a5d815efbf2bcd23b84548ececd11ffa1f89ebcbc5d411845b7a3834d6f7e16aa0b1 SHA512 b26a83cd7e57d8821d09e5e1aeaa2fa5837ab2f3901a006cfd49b059a3cfc98d7ea236dc39a2e24365196bd45c2124396795fd46fdaf4d7cb41aabb45ff85326 diff --git a/dev-ada/langkit/langkit-24.0.0.ebuild b/dev-ada/langkit/langkit-24.0.0.ebuild new file mode 100644 index ..a819cb00aaa7 --- /dev/null +++ b/dev-ada/langkit/langkit-24.0.0.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +ADA_COMPAT=( gcc_12 gcc_13 ) + +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 ada multiprocessing + +DESCRIPTION="A Python framework to generate language parsers" +HOMEPAGE="https://www.adacore.com/community; +SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+shared static-libs static-pic" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ${ADA_REQUIRED_USE} + || ( shared static-libs static-pic )" +RESTRICT="test" + +RDEPEND="${PYTHON_DEPS} + ${ADA_DEPS} + dev-ada/gnatcoll-core:= + dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?] + dev-ada/AdaSAT[${ADA_USEDEP},shared?,static-libs?,static-pic?] + dev-python/mako[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/funcy[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/mypy[${PYTHON_USEDEP}] + dev-python/types-gdb[${PYTHON_USEDEP}] + dev-python/types-docutils[${PYTHON_USEDEP}] + dev-ada/e3-core[${PYTHON_USEDEP}]" +BDEPEND="${RDEPEND}" + +python_prepare_all() { + distutils-r1_python_prepare_all + cd testsuite/tests + + # missing gprbuild option to build libraries static/relocatable + rm -r {langkit_support,adalog,misc/link_two_libs} || die + rm -r misc/standalone || die + + # other failures + rm -r misc/docstrings_lkt_roles || die +} + +python_compile_all() { + build () { + rm -f langkit/support/obj/dev/*lexch + gprbuild -j$(makeopts_jobs) -p -v \ + -XLIBRARY_TYPE=$1 -P langkit/support/langkit_support.gpr -XBUILD_MODE=dev \ + -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" + } + if use shared; then + build relocatable + fi + if use static-libs; then + build static + fi + if use static-pic; then + build static-pic + fi + gprbuild -j$(makeopts_jobs) -p -v \ + -P sigsegv_handler/langkit_sigsegv_handler.gpr -XBUILD_MODE=dev \ + -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" +} + +python_test_all() { + export GPR_PROJECT_PATH="${S}"/langkit/support + ${EPYTHON} ./manage.py make --no-langkit-support || die + eval $(./manage.py setenv) + ${EPYTHON} ./manage.py test -v \ + --disable-ocaml \ + --disable-gdb \ + --disable-tear-up-builds \ + --restricted-env \ + --jobs $(makeopts_jobs) \ + |& tee langkit.testOut + grep -qw FAIL langkit.testOut && die +} + +python_install_all() { + build () { + gprinstall -v -P langkit/support/langkit_support.gpr -p -XBUILD_MODE=dev \ + --prefix="${D}"/usr --build-var=LIBRARY_TYPE \ + --build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \ + --sources-subdir=include/langkit_support \ + -XLIBRARY_TYPE=$1 --build-name=$1 || die + } + if use static-libs; then + build static +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 0c16cfc98c7c595f47b90731a2da8e1969b73720 Author: Alfredo Tupone gentoo org> AuthorDate: Wed Mar 6 18:36:13 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Mar 6 18:36:36 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c16cfc9 dev-ada/langkit: DistutilsNonPEP517Build Closes: https://bugs.gentoo.org/909904 Signed-off-by: Alfredo Tupone gentoo.org> .../langkit/{langkit-23.0.0-r2.ebuild => langkit-23.0.0-r3.ebuild} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-ada/langkit/langkit-23.0.0-r2.ebuild b/dev-ada/langkit/langkit-23.0.0-r3.ebuild similarity index 96% rename from dev-ada/langkit/langkit-23.0.0-r2.ebuild rename to dev-ada/langkit/langkit-23.0.0-r3.ebuild index 0048c09c5589..ba2c97a21b70 100644 --- a/dev-ada/langkit/langkit-23.0.0-r2.ebuild +++ b/dev-ada/langkit/langkit-23.0.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 ) -DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 ada multiprocessing DESCRIPTION="A Python framework to generate language parsers" @@ -25,6 +25,7 @@ RESTRICT="test" RDEPEND="${PYTHON_DEPS} ${ADA_DEPS} + dev-ada/gnatcoll-core:= dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?] dev-python/mako[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 604e8025d76df9b0176d1a0ed54e37c78ab18f65 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Dec 10 09:37:42 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Dec 10 09:38:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604e8025 dev-ada/langkit: support gcc_13 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/{langkit-23.0.0-r1.ebuild => langkit-23.0.0-r2.ebuild} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-ada/langkit/langkit-23.0.0-r1.ebuild b/dev-ada/langkit/langkit-23.0.0-r2.ebuild similarity index 98% rename from dev-ada/langkit/langkit-23.0.0-r1.ebuild rename to dev-ada/langkit/langkit-23.0.0-r2.ebuild index 26dee3b78532..0048c09c5589 100644 --- a/dev-ada/langkit/langkit-23.0.0-r1.ebuild +++ b/dev-ada/langkit/langkit-23.0.0-r2.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -ADA_COMPAT=( gnat_2021 gcc_12 ) +ADA_COMPAT=( gnat_2021 gcc_12 gcc_13 ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 ada multiprocessing @@ -21,6 +21,7 @@ IUSE="+shared static-libs static-pic" REQUIRED_USE="${PYTHON_REQUIRED_USE} ${ADA_REQUIRED_USE} || ( shared static-libs static-pic )" +RESTRICT="test" RDEPEND="${PYTHON_DEPS} ${ADA_DEPS}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 5c87bb19f2c15af9aefd73defa102d06cb61df7b Author: Alfredo Tupone gentoo org> AuthorDate: Tue Mar 21 20:53:08 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Mar 21 21:00:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c87bb19 dev-ada/langkit: drop gcc_12_2_0 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-23.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/langkit/langkit-23.0.0-r1.ebuild b/dev-ada/langkit/langkit-23.0.0-r1.ebuild index dcae44ffc718..26dee3b78532 100644 --- a/dev-ada/langkit/langkit-23.0.0-r1.ebuild +++ b/dev-ada/langkit/langkit-23.0.0-r1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..11} ) -ADA_COMPAT=( gnat_2021 gcc_12 gcc_12_2_0 ) +ADA_COMPAT=( gnat_2021 gcc_12 ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 ada multiprocessing
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: 03fa0b2ce8bdb625ccdcef676f95ba9617c1f207 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Mar 19 19:53:10 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Mar 19 19:53:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03fa0b2c dev-ada/langkit: drop 22.0.0-r3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/Manifest | 1 - dev-ada/langkit/files/langkit-22.0.0-abc.patch | 24 --- dev-ada/langkit/langkit-22.0.0-r3.ebuild | 90 -- 3 files changed, 115 deletions(-) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index 59b6bdba50b4..9a010d224369 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1,2 +1 @@ -DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909 DIST langkit-23.0.0.tar.gz 1178557 BLAKE2B c3b81cafea3afcfd90a87192dca5abd0f19c5ff4e195515dd7c4df70824bf328c24855a6761264b89bf44a56afc8dd77b78fbf322c6f92299082507aa65d61e5 SHA512 6cc6adacb157a47ebc8da46591e45a4ff212fba2cd5ac80c12adb2e84f4508735d98dc68ffce86aa5e5e8d873e6f51efb4f88f4d76a190b9eb0024bf69deefc1 diff --git a/dev-ada/langkit/files/langkit-22.0.0-abc.patch b/dev-ada/langkit/files/langkit-22.0.0-abc.patch deleted file mode 100644 index 0b3e9bbf8f4f.. --- a/dev-ada/langkit/files/langkit-22.0.0-abc.patch +++ /dev/null @@ -1,24 +0,0 @@ -From cdc5768fb8db416e4eede97639f381a537ae9336 Mon Sep 17 00:00:00 2001 -From: Charles Pigott -Date: Wed, 10 Nov 2021 20:42:12 + -Subject: [PATCH] Use collections.abc.Sequence as the alias is set to be - removed - -Alias has been in place since Py 3.3, and minimum (test) version is 3.7. - langkit/templates/python_api/module_py.mako | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako -index 831fb6044..65373fdbc 100644 a/langkit/templates/python_api/module_py.mako -+++ b/langkit/templates/python_api/module_py.mako -@@ -1503,7 +1503,7 @@ class ${root_astnode_name}: - if isinstance(ast_type_or_pred, type): - sought_type = ast_type_or_pred - pred = lambda node: isinstance(node, sought_type) --elif isinstance(ast_type_or_pred, collections.Sequence): -+elif isinstance(ast_type_or_pred, collections.abc.Sequence): - sought_types = ast_type_or_pred - pred = lambda node: isinstance(node, tuple(sought_types)) - else: diff --git a/dev-ada/langkit/langkit-22.0.0-r3.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild deleted file mode 100644 index a5c90c452b7b.. --- a/dev-ada/langkit/langkit-22.0.0-r3.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_10 ) -ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) - -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 ada multiprocessing - -DESCRIPTION="A Python framework to generate language parsers" -HOMEPAGE="https://www.adacore.com/community; -SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+shared static-libs static-pic" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - ${ADA_REQUIRED_USE} - || ( shared static-libs static-pic )" - -RDEPEND="${PYTHON_DEPS} - ${ADA_DEPS} - dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?] - dev-python/mako[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/funcy[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-ada/e3-core[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-abc.patch ) - -python_prepare_all() { - distutils-r1_python_prepare_all - cd testsuite/tests - - # missing gprbuild option to build libraries static/relocatable - rm -r {langkit_support,adalog,misc/link_two_libs} || die - - # require railroad-diagrams - rm -r contrib/svg_railroad_diagrams || die -} - -python_compile_all() { - build () { - gprbuild -j$(makeopts_jobs) -p -v \ - -XLIBRARY_TYPE=$1 -P support/langkit_support.gpr -XBUILD_MODE=dev \ - -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" - } - if use shared; then - build relocatable - fi - if use static-libs; then - build static - fi - if use static-pic; then - build static-pic - fi -} - -python_test_all() { -
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: 44f7b873fbe429c5346ecd398cb9fcd00b98 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Feb 25 18:19:39 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Feb 25 18:21:05 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f7b873 dev-ada/langkit: update EAPI 7 -> 8 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/files/langkit-23.0.0-py311.patch | 88 dev-ada/langkit/langkit-23.0.0-r1.ebuild | 11 +-- 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dev-ada/langkit/files/langkit-23.0.0-py311.patch b/dev-ada/langkit/files/langkit-23.0.0-py311.patch new file mode 100644 index ..b85027ec2b8d --- /dev/null +++ b/dev-ada/langkit/files/langkit-23.0.0-py311.patch @@ -0,0 +1,88 @@ +--- a/langkit/expressions/collections.py 2023-02-25 17:31:43.261369482 +0100 b/langkit/expressions/collections.py 2023-02-25 17:32:03.068054949 +0100 +@@ -265,15 +265,15 @@ + " function" + ) + +-argspec = inspect.getargspec(expr_fn) ++argspec = inspect.getfullargspec(expr_fn) + + check_multiple([ + (len(argspec.args) in (1, 2), + 'Invalid collection iteration lambda: only one' + ' or two parameters expected'), +-(not argspec.varargs and not argspec.keywords, ++(not argspec.varargs and not argspec.varkw, + 'Invalid collection iteration lambda: no *args or **kwargs'), + (not argspec.defaults, + 'Invalid collection iteration lambda: No default values allowed' + 'Invalid matcher lambda' + ) +--- a/langkit/expressions/structs.py 2023-02-25 17:32:21.884756077 +0100 b/langkit/expressions/structs.py 2023-02-25 17:32:32.382589322 +0100 +@@ -1327,9 +1327,9 @@ + self.matchers = [] + + for i, match_fn in enumerate(self.matchers_functions): +-argspec = inspect.getargspec(match_fn) ++argspec = inspect.getfullargspec(match_fn) + check_source_language( + len(argspec.args) == 1 and + not argspec.varargs and +-not argspec.keywords and ++not argspec.varkw and + (not argspec.defaults or len(argspec.defaults) < 2), +--- a/langkit/expressions/base.py 2023-02-25 17:29:35.964403798 +0100 b/langkit/expressions/base.py 2023-02-25 17:30:28.362565456 +0100 +@@ -158,11 +158,11 @@ + fn_arguments = [] + fn_expr = None + +-argspec = inspect.getargspec(fn) ++argspec = inspect.getfullargspec(fn) + defaults = argspec.defaults or [] + + check_multiple([ +-(not argspec.varargs or not argspec.keywords, 'Invalid' ++(not argspec.varargs or not argspec.varkw, 'Invalid' + ' function signature: no *args nor **kwargs allowed'), + + (len(argspec.args) == len(defaults), 'All parameters ' +@@ -2822,7 +2822,7 @@ + lambda_fn = None + + else: +-argspec = inspect.getargspec(lambda_fn) ++argspec = inspect.getfullargspec(lambda_fn) + + var_names = argspec.args + var_exprs = argspec.defaults or [] +@@ -2843,10 +2843,10 @@ + if self.lambda_fn is None: + return + +-argspec = inspect.getargspec(self.lambda_fn) ++argspec = inspect.getfullargspec(self.lambda_fn) + + check_multiple([ +-(not argspec.varargs and not argspec.keywords, ++(not argspec.varargs and not argspec.varkw, + 'Invalid function for Let expression (*args and **kwargs ' + 'not accepted)'), + +--- a/langkit/expressions/boolean.py 2023-02-25 17:30:59.820062103 +0100 b/langkit/expressions/boolean.py 2023-02-25 17:31:10.565890137 +0100 +@@ -475,11 +475,11 @@ + if self.then_expr: + return + +-argspec = inspect.getargspec(self.then_fn) ++argspec = inspect.getfullargspec(self.then_fn) + check_source_language( + len(argspec.args) == 1 + and not argspec.varargs +-and not argspec.keywords ++and not argspec.varkw + and not argspec.defaults, + 'Invalid lambda for Then expression: exactly one parameter is' + ' required, without a default value' diff --git a/dev-ada/langkit/langkit-23.0.0-r1.ebuild b/dev-ada/langkit/langkit-23.0.0-r1.ebuild index f0cf67a22fdb..dcae44ffc718 100644 --- a/dev-ada/langkit/langkit-23.0.0-r1.ebuild +++ b/dev-ada/langkit/langkit-23.0.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_10 ) -ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) +PYTHON_COMPAT=( python3_{10..11} ) +ADA_COMPAT=( gnat_2021 gcc_12 gcc_12_2_0 ) DISTUTILS_USE_SETUPTOOLS=no inherit
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: f1b8ed2c4e9dec1925a91ee824be0fe0c437d877 Author: Michał Górny gentoo org> AuthorDate: Tue Jan 10 14:28:19 2023 + Commit: Michał Górny gentoo org> CommitDate: Tue Jan 10 14:30:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b8ed2c dev-ada/langkit: Remove Python < 3.10 Signed-off-by: Michał Górny gentoo.org> dev-ada/langkit/langkit-22.0.0-r3.ebuild | 4 ++-- dev-ada/langkit/langkit-23.0.0-r1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-ada/langkit/langkit-22.0.0-r3.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild index 9e5afe2cc7e0..a5c90c452b7b 100644 --- a/dev-ada/langkit/langkit-22.0.0-r3.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9,10} ) +PYTHON_COMPAT=( python3_10 ) ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) DISTUTILS_USE_SETUPTOOLS=no diff --git a/dev-ada/langkit/langkit-23.0.0-r1.ebuild b/dev-ada/langkit/langkit-23.0.0-r1.ebuild index 35be6b6a98d1..f0cf67a22fdb 100644 --- a/dev-ada/langkit/langkit-23.0.0-r1.ebuild +++ b/dev-ada/langkit/langkit-23.0.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_10 ) ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) DISTUTILS_USE_SETUPTOOLS=no
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: ab3a06e9c849c21c2e6e07d102bb583b14af2ba3 Author: Alfredo Tupone gentoo org> AuthorDate: Sun Dec 11 21:00:51 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Dec 11 21:07:57 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab3a06e9 dev-ada/langkit: install liblangkit_sigsegv_handler.so Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/{langkit-23.0.0.ebuild => langkit-23.0.0-r1.ebuild} | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-ada/langkit/langkit-23.0.0.ebuild b/dev-ada/langkit/langkit-23.0.0-r1.ebuild similarity index 96% rename from dev-ada/langkit/langkit-23.0.0.ebuild rename to dev-ada/langkit/langkit-23.0.0-r1.ebuild index d384194e8cee..35be6b6a98d1 100644 --- a/dev-ada/langkit/langkit-23.0.0.ebuild +++ b/dev-ada/langkit/langkit-23.0.0-r1.ebuild @@ -101,4 +101,6 @@ python_install_all() { if use shared; then build relocatable fi + gprinstall -v -P sigsegv_handler/langkit_sigsegv_handler.gpr -p -XBUILD_MODE=dev \ + --prefix="${D}"/usr || die }
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/, dev-ada/langkit/
commit: 64d6a14dc5039a9de9d494473511120bf43b7e85 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Dec 10 18:18:59 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Dec 10 18:21:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64d6a14d dev-ada/langkit: add 23.0.0 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/Manifest | 1 + dev-ada/langkit/files/langkit-23.0.0-gentoo.patch | 10 +++ dev-ada/langkit/langkit-23.0.0.ebuild | 104 ++ 3 files changed, 115 insertions(+) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index ea7b6a9fbab0..59b6bdba50b4 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1 +1,2 @@ DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909 +DIST langkit-23.0.0.tar.gz 1178557 BLAKE2B c3b81cafea3afcfd90a87192dca5abd0f19c5ff4e195515dd7c4df70824bf328c24855a6761264b89bf44a56afc8dd77b78fbf322c6f92299082507aa65d61e5 SHA512 6cc6adacb157a47ebc8da46591e45a4ff212fba2cd5ac80c12adb2e84f4508735d98dc68ffce86aa5e5e8d873e6f51efb4f88f4d76a190b9eb0024bf69deefc1 diff --git a/dev-ada/langkit/files/langkit-23.0.0-gentoo.patch b/dev-ada/langkit/files/langkit-23.0.0-gentoo.patch new file mode 100644 index ..cbae758013e2 --- /dev/null +++ b/dev-ada/langkit/files/langkit-23.0.0-gentoo.patch @@ -0,0 +1,10 @@ +--- a/langkit/parsers.py 2022-12-08 23:09:42.178267815 +0100 b/langkit/parsers.py 2022-12-08 22:33:40.755660102 +0100 +@@ -1306,6 +1306,7 @@ + # ... and we want to memoize the result. + self.cached_type = None + ++@property + def can_parse_token_node(self) -> bool: + return all(p.can_parse_token_node for p in self.parsers) + diff --git a/dev-ada/langkit/langkit-23.0.0.ebuild b/dev-ada/langkit/langkit-23.0.0.ebuild new file mode 100644 index ..d384194e8cee --- /dev/null +++ b/dev-ada/langkit/langkit-23.0.0.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) +ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) + +DISTUTILS_USE_SETUPTOOLS=no +inherit distutils-r1 ada multiprocessing + +DESCRIPTION="A Python framework to generate language parsers" +HOMEPAGE="https://www.adacore.com/community; +SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+shared static-libs static-pic" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ${ADA_REQUIRED_USE} + || ( shared static-libs static-pic )" + +RDEPEND="${PYTHON_DEPS} + ${ADA_DEPS} + dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?] + dev-python/mako[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/funcy[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/mypy[${PYTHON_USEDEP}] + dev-python/types-gdb[${PYTHON_USEDEP}] + dev-python/types-docutils[${PYTHON_USEDEP}] + dev-ada/e3-core[${PYTHON_USEDEP}]" +BDEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +python_prepare_all() { + distutils-r1_python_prepare_all + cd testsuite/tests + + # missing gprbuild option to build libraries static/relocatable + rm -r {langkit_support,adalog,misc/link_two_libs} || die + rm -r misc/standalone || die + + # other failures + rm -r misc/docstrings_lkt_roles || die +} + +python_compile_all() { + build () { + rm -f langkit/support/obj/dev/*lexch + gprbuild -j$(makeopts_jobs) -p -v \ + -XLIBRARY_TYPE=$1 -P langkit/support/langkit_support.gpr -XBUILD_MODE=dev \ + -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" + } + if use shared; then + build relocatable + fi + if use static-libs; then + build static + fi + if use static-pic; then + build static-pic + fi + gprbuild -j$(makeopts_jobs) -p -v \ + -P sigsegv_handler/langkit_sigsegv_handler.gpr -XBUILD_MODE=dev \ + -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" +} + +python_test_all() { + export GPR_PROJECT_PATH="${S}"/langkit/support + ${EPYTHON} ./manage.py make --no-langkit-support || die + eval $(./manage.py setenv) + ${EPYTHON} ./manage.py test -v \ + --disable-ocaml \ + --disable-gdb \ + --disable-tear-up-builds \ +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 1b09425a9d1598c749629a4f794bb411d5966344 Author: Alfredo Tupone gentoo org> AuthorDate: Mon Dec 5 13:17:36 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Dec 5 13:23:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b09425a dev-ada/langkit: add github upstream metadata Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml index affd1ad935dc..6da3e84f2af3 100644 --- a/dev-ada/langkit/metadata.xml +++ b/dev-ada/langkit/metadata.xml @@ -18,4 +18,7 @@ including tools working on potentially changing and incorrect code, such as IDEs. + + AdaCore/langkit +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: f1a7cee6324bdda24a8af33cf9875506a0d614b3 Author: Alfredo Tupone gentoo org> AuthorDate: Mon Nov 21 17:59:20 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Nov 21 17:59:20 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1a7cee6 dev-ada/langkit: drop gnat_2020 support Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-22.0.0-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/langkit/langkit-22.0.0-r3.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild index 23c1cec4ad52..9e5afe2cc7e0 100644 --- a/dev-ada/langkit/langkit-22.0.0-r3.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r3.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8,9,10} ) -ADA_COMPAT=( gnat_202{0,1} gcc_12_2_0 ) +ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 ada multiprocessing
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: 81a8882a480668357ce3798fc56ba970862a72bd Author: Alfredo Tupone gentoo org> AuthorDate: Sun Oct 2 17:53:55 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Oct 2 17:53:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81a8882a dev-ada/langkit: fix deprecated collections.Sequence Closes: https://bugs.gentoo.org/873787 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/files/langkit-22.0.0-abc.patch | 24 ++ ...t-22.0.0-r2.ebuild => langkit-22.0.0-r3.ebuild} | 2 ++ 2 files changed, 26 insertions(+) diff --git a/dev-ada/langkit/files/langkit-22.0.0-abc.patch b/dev-ada/langkit/files/langkit-22.0.0-abc.patch new file mode 100644 index ..0b3e9bbf8f4f --- /dev/null +++ b/dev-ada/langkit/files/langkit-22.0.0-abc.patch @@ -0,0 +1,24 @@ +From cdc5768fb8db416e4eede97639f381a537ae9336 Mon Sep 17 00:00:00 2001 +From: Charles Pigott +Date: Wed, 10 Nov 2021 20:42:12 + +Subject: [PATCH] Use collections.abc.Sequence as the alias is set to be + removed + +Alias has been in place since Py 3.3, and minimum (test) version is 3.7. +--- + langkit/templates/python_api/module_py.mako | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako +index 831fb6044..65373fdbc 100644 +--- a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako +@@ -1503,7 +1503,7 @@ class ${root_astnode_name}: + if isinstance(ast_type_or_pred, type): + sought_type = ast_type_or_pred + pred = lambda node: isinstance(node, sought_type) +-elif isinstance(ast_type_or_pred, collections.Sequence): ++elif isinstance(ast_type_or_pred, collections.abc.Sequence): + sought_types = ast_type_or_pred + pred = lambda node: isinstance(node, tuple(sought_types)) + else: diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild similarity index 98% rename from dev-ada/langkit/langkit-22.0.0-r2.ebuild rename to dev-ada/langkit/langkit-22.0.0-r3.ebuild index d9620aaca448..23c1cec4ad52 100644 --- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r3.ebuild @@ -32,6 +32,8 @@ RDEPEND="${PYTHON_DEPS} dev-ada/e3-core[${PYTHON_USEDEP}]" BDEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}"/${P}-abc.patch ) + python_prepare_all() { distutils-r1_python_prepare_all cd testsuite/tests
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 6639a00f2dffc84ca83990fc6641b292dce69c15 Author: Alfredo Tupone gentoo org> AuthorDate: Thu Sep 29 18:53:52 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Sep 29 18:53:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6639a00f dev-ada/langkit: add gcc_12_2_0 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-22.0.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild index 041b256514f9..d9620aaca448 100644 --- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{8,9,10} ) -ADA_COMPAT=( gnat_202{0,1} ) +ADA_COMPAT=( gnat_202{0,1} gcc_12_2_0 ) DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 ada multiprocessing
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: c47d7b08221451c141066170b157d3c45ae20f23 Author: Alfredo Tupone gentoo org> AuthorDate: Thu Feb 3 16:42:25 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Feb 3 16:42:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47d7b08 dev-ada/langkit: ~x86 and python3.10 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-22.0.0-r2.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild index ba69bb3b62b6..041b256514f9 100644 --- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8,9,10} ) ADA_COMPAT=( gnat_202{0,1} ) DISTUTILS_USE_SETUPTOOLS=no @@ -16,7 +16,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="GPL-3" SLOT="0/${PV}" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="+shared static-libs static-pic" REQUIRED_USE="${PYTHON_REQUIRED_USE} ${ADA_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
commit: 854110b65b471a0ad2a7b2b9813f9f806d521297 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Dec 22 07:06:57 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Jan 19 20:31:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854110b6 dev-ada/langkit: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/23467 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/files/langkit-22.0.0-gnarl.patch | 10 -- 1 file changed, 10 deletions(-) diff --git a/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch b/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch deleted file mode 100644 index fb69768dc9de.. --- a/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch +++ /dev/null @@ -1,10 +0,0 @@ a/langkit/templates/mains_project_file.mako2020-06-09 09:34:36.677265457 +0200 -+++ b/langkit/templates/mains_project_file.mako2020-06-09 09:35:30.569451995 +0200 -@@ -40,4 +40,7 @@ - for Switches ("ada") use ("-E"); -end Binder; - -+ package Linker is -+ for Switches ("ada") use ("-lgnat", "-lgnarl"); -+ end Linker; - end Mains;
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: f5772478513aa157eec5705b6d56aa8a56c991ff Author: Alfredo Tupone gentoo org> AuthorDate: Wed Dec 22 19:10:12 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Dec 22 19:10:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5772478 dev-ada/langkit: add ada dependency Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-22.0.0-r2.ebuild | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild index 4e998a1d09a8..ba69bb3b62b6 100644 --- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild @@ -4,9 +4,10 @@ EAPI=7 PYTHON_COMPAT=( python3_{8,9} ) +ADA_COMPAT=( gnat_202{0,1} ) DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 multiprocessing +inherit distutils-r1 ada multiprocessing DESCRIPTION="A Python framework to generate language parsers" HOMEPAGE="https://www.adacore.com/community; @@ -18,10 +19,12 @@ SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="+shared static-libs static-pic" REQUIRED_USE="${PYTHON_REQUIRED_USE} + ${ADA_REQUIRED_USE} || ( shared static-libs static-pic )" RDEPEND="${PYTHON_DEPS} - dev-ada/gnatcoll-bindings[gmp,iconv,shared?,static-libs?,static-pic?] + ${ADA_DEPS} + dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?] dev-python/mako[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/funcy[${PYTHON_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 895f47a7fd1f933960c82443bdf6827c01d35ee8 Author: Alfredo Tupone gentoo org> AuthorDate: Mon Dec 20 20:41:55 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Dec 20 20:41:55 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=895f47a7 dev-ada/langkit: fix failing test Closes: https://bugs.gentoo.org/829655 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-22.0.0-r2.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild index 4393f8601a43..4e998a1d09a8 100644 --- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild @@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( shared static-libs static-pic )" RDEPEND="${PYTHON_DEPS} - dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] + dev-ada/gnatcoll-bindings[gmp,iconv,shared?,static-libs?,static-pic?] dev-python/mako[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/funcy[${PYTHON_USEDEP}] @@ -58,6 +58,7 @@ python_compile_all() { } python_test_all() { + export GPR_PROJECT_PATH="${S}"/support ${EPYTHON} ./manage.py make --no-langkit-support || die eval $(./manage.py setenv) ${EPYTHON} ./manage.py test --verbose |& tee langkit.testOut
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 7a9f89e7d1d46ad1347220438f537cc6dea3199e Author: Alfredo Tupone gentoo org> AuthorDate: Sun Dec 19 10:24:25 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Dec 19 10:24:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a9f89e7 dev-ada/langkit: build something Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-22.0.0-r1.ebuild | 67 dev-ada/langkit/langkit-22.0.0-r2.ebuild | 6 +-- 2 files changed, 3 insertions(+), 70 deletions(-) diff --git a/dev-ada/langkit/langkit-22.0.0-r1.ebuild b/dev-ada/langkit/langkit-22.0.0-r1.ebuild deleted file mode 100644 index 60713a0d90b8.. --- a/dev-ada/langkit/langkit-22.0.0-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9} ) - -DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 multiprocessing - -DESCRIPTION="A Python framework to generate language parsers" -HOMEPAGE="https://www.adacore.com/community; -SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - dev-ada/gnatcoll-bindings[iconv,shared,static-libs] - dev-python/mako[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/funcy[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-ada/e3-core[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${P}-gnarl.patch -) - -src_prepare() { - default - cd testsuite/tests - - # missing gprbuild option to build libraries static/relocatable - rm -r {langkit_support,adalog,misc/link_two_libs} || die - - # require railroad-diagrams - rm -r contrib/svg_railroad_diagrams || die -} - -src_compile() { - gprbuild -v -P support/langkit_support.gpr -p -j$(makeopts_jobs) \ - -XBUILD_MODE=dev -XLIBRARY_TYPE=relocatable -cargs:Ada ${ADAFLAGS} \ - || die - distutils-r1_src_compile -} - -src_test() { - ${EPYTHON} ./manage.py make --no-langkit-support || die - eval $(./manage.py setenv) - ${EPYTHON} ./manage.py test --verbose |& tee langkit.testOut - grep -qw FAIL langkit.testOut && die -} - -src_install() { - gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \ - --prefix="${D}"/usr --build-var=LIBRARY_TYPE \ - --build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \ - --sources-subdir=include/langkit_support \ - -XLIBRARY_TYPE=relocatable --build-name=relocatable || die - distutils-r1_src_install -} diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild index ac883ef76f9f..4393f8601a43 100644 --- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild @@ -14,11 +14,11 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" -SLOT="0" +SLOT="0/${PV}" KEYWORDS="~amd64" IUSE="+shared static-libs static-pic" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( shared static-libs static-pic )" RDEPEND="${PYTHON_DEPS} dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?]
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 6c8d8a66b233b67c58ce94f91175061ee6d9bd70 Author: Alfredo Tupone gentoo org> AuthorDate: Tue Dec 14 07:18:58 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Dec 14 07:18:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c8d8a66 dev-ada/langkit: add USE static-libs & static-pic Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-22.0.0-r2.ebuild | 84 dev-ada/langkit/metadata.xml | 4 ++ 2 files changed, 88 insertions(+) diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild new file mode 100644 index ..ac883ef76f9f --- /dev/null +++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) + +DISTUTILS_USE_SETUPTOOLS=no +inherit distutils-r1 multiprocessing + +DESCRIPTION="A Python framework to generate language parsers" +HOMEPAGE="https://www.adacore.com/community; +SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+shared static-libs static-pic" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-ada/gnatcoll-bindings[iconv,shared?,static-libs?,static-pic?] + dev-python/mako[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/funcy[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-ada/e3-core[${PYTHON_USEDEP}]" +BDEPEND="${RDEPEND}" + +python_prepare_all() { + distutils-r1_python_prepare_all + cd testsuite/tests + + # missing gprbuild option to build libraries static/relocatable + rm -r {langkit_support,adalog,misc/link_two_libs} || die + + # require railroad-diagrams + rm -r contrib/svg_railroad_diagrams || die +} + +python_compile_all() { + build () { + gprbuild -j$(makeopts_jobs) -p -v \ + -XLIBRARY_TYPE=$1 -P support/langkit_support.gpr -XBUILD_MODE=dev \ + -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" + } + if use shared; then + build relocatable + fi + if use static-libs; then + build static + fi + if use static-pic; then + build static-pic + fi +} + +python_test_all() { + ${EPYTHON} ./manage.py make --no-langkit-support || die + eval $(./manage.py setenv) + ${EPYTHON} ./manage.py test --verbose |& tee langkit.testOut + grep -qw FAIL langkit.testOut && die +} + +python_install_all() { + build () { + gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \ + --prefix="${D}"/usr --build-var=LIBRARY_TYPE \ + --build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \ + --sources-subdir=include/langkit_support \ + -XLIBRARY_TYPE=$1 --build-name=$1 || die + } + if use shared; then + build relocatable + fi + if use static-libs; then + build static + fi + if use static-pic; then + build static-pic + fi +} diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml index 1d15b41d3ff8..09df5e8fc04c 100644 --- a/dev-ada/langkit/metadata.xml +++ b/dev-ada/langkit/metadata.xml @@ -4,6 +4,10 @@ a...@gentoo.org + + Build shared library + Build static library with pic code + Langkit (nickname for language kit) is a tool whose purpose is to make it easy to create syntactic and semantic analysis engines. Write a
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: d30e9c27107ba7f3788774fd3d4d9aac1742e4df Author: Alfredo Tupone gentoo org> AuthorDate: Thu Dec 9 18:33:11 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Dec 9 18:33:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30e9c27 dev-ada/langkit: LIBRARY_TYPE is now handled in gnatcoll-bindings Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/files/langkit-22.0.0-test.patch | 20 dev-ada/langkit/langkit-22.0.0-r1.ebuild| 1 - 2 files changed, 21 deletions(-) diff --git a/dev-ada/langkit/files/langkit-22.0.0-test.patch b/dev-ada/langkit/files/langkit-22.0.0-test.patch deleted file mode 100644 index b083e60f680d.. --- a/dev-ada/langkit/files/langkit-22.0.0-test.patch +++ /dev/null @@ -1,20 +0,0 @@ a/testsuite/python_support/utils.py2021-12-08 14:12:47.457472580 +0100 -+++ b/testsuite/python_support/utils.py2021-12-08 14:14:26.142767154 +0100 -@@ -379,6 +379,7 @@ - )) - run('gprbuild', '-Pgen', '-q', '-p', - '-XLIBRARY_TYPE=static', -+'-XGNATCOLL_GMP_BUILD=static', - '-XXMLADA_BUILD=static') - - for i, m in enumerate(ada_main): a/langkit/libmanage.py 2021-12-08 15:13:07.952581993 +0100 -+++ b/langkit/libmanage.py 2021-12-08 15:13:58.429825946 +0100 -@@ -897,6 +897,7 @@ - result = ['-XBUILD_MODE={}'.format(self.build_mode), - '-XLIBRARY_TYPE={}'.format(library_type), - '-XGPR_BUILD={}'.format(library_type), -+ '-XGNATCOLL_GMP_BUILD={}'.format(library_type), - '-XXMLADA_BUILD={}'.format(library_type)] - - if self.enable_build_warnings: diff --git a/dev-ada/langkit/langkit-22.0.0-r1.ebuild b/dev-ada/langkit/langkit-22.0.0-r1.ebuild index 398c3148071d..60713a0d90b8 100644 --- a/dev-ada/langkit/langkit-22.0.0-r1.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r1.ebuild @@ -30,7 +30,6 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-gnarl.patch - "${FILESDIR}"/${P}-test.patch ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/, dev-ada/langkit/
commit: 9536c484d34ac3db9c18732b7127849dad4c1339 Author: Alfredo Tupone gentoo org> AuthorDate: Wed Dec 8 16:35:50 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Dec 8 16:36:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9536c484 dev-ada/langkit: add tests Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/files/langkit-22.0.0-test.patch| 20 ...gkit-22.0.0.ebuild => langkit-22.0.0-r1.ebuild} | 22 -- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dev-ada/langkit/files/langkit-22.0.0-test.patch b/dev-ada/langkit/files/langkit-22.0.0-test.patch new file mode 100644 index ..b083e60f680d --- /dev/null +++ b/dev-ada/langkit/files/langkit-22.0.0-test.patch @@ -0,0 +1,20 @@ +--- a/testsuite/python_support/utils.py2021-12-08 14:12:47.457472580 +0100 b/testsuite/python_support/utils.py2021-12-08 14:14:26.142767154 +0100 +@@ -379,6 +379,7 @@ + )) + run('gprbuild', '-Pgen', '-q', '-p', + '-XLIBRARY_TYPE=static', ++'-XGNATCOLL_GMP_BUILD=static', + '-XXMLADA_BUILD=static') + + for i, m in enumerate(ada_main): +--- a/langkit/libmanage.py 2021-12-08 15:13:07.952581993 +0100 b/langkit/libmanage.py 2021-12-08 15:13:58.429825946 +0100 +@@ -897,6 +897,7 @@ + result = ['-XBUILD_MODE={}'.format(self.build_mode), + '-XLIBRARY_TYPE={}'.format(library_type), + '-XGPR_BUILD={}'.format(library_type), ++ '-XGNATCOLL_GMP_BUILD={}'.format(library_type), + '-XXMLADA_BUILD={}'.format(library_type)] + + if self.enable_build_warnings: diff --git a/dev-ada/langkit/langkit-22.0.0.ebuild b/dev-ada/langkit/langkit-22.0.0-r1.ebuild similarity index 70% rename from dev-ada/langkit/langkit-22.0.0.ebuild rename to dev-ada/langkit/langkit-22.0.0-r1.ebuild index 2fe1c770f737..398c3148071d 100644 --- a/dev-ada/langkit/langkit-22.0.0.ebuild +++ b/dev-ada/langkit/langkit-22.0.0-r1.ebuild @@ -16,12 +16,11 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -RESTRICT="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} - dev-ada/gnatcoll-bindings[iconv,shared] + dev-ada/gnatcoll-bindings[iconv,shared,static-libs] dev-python/mako[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/funcy[${PYTHON_USEDEP}] @@ -31,8 +30,20 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-gnarl.patch + "${FILESDIR}"/${P}-test.patch ) +src_prepare() { + default + cd testsuite/tests + + # missing gprbuild option to build libraries static/relocatable + rm -r {langkit_support,adalog,misc/link_two_libs} || die + + # require railroad-diagrams + rm -r contrib/svg_railroad_diagrams || die +} + src_compile() { gprbuild -v -P support/langkit_support.gpr -p -j$(makeopts_jobs) \ -XBUILD_MODE=dev -XLIBRARY_TYPE=relocatable -cargs:Ada ${ADAFLAGS} \ @@ -40,6 +51,13 @@ src_compile() { distutils-r1_src_compile } +src_test() { + ${EPYTHON} ./manage.py make --no-langkit-support || die + eval $(./manage.py setenv) + ${EPYTHON} ./manage.py test --verbose |& tee langkit.testOut + grep -qw FAIL langkit.testOut && die +} + src_install() { gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \ --prefix="${D}"/usr --build-var=LIBRARY_TYPE \
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/, dev-ada/langkit/
commit: 3280155e870e24fcf0027fd6961f42f422a22dfb Author: Alfredo Tupone gentoo org> AuthorDate: Mon Dec 6 12:53:25 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Dec 6 12:53:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3280155e dev-ada/langkit: A Python framework to generate language parsers Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/Manifest | 1 + dev-ada/langkit/files/langkit-22.0.0-gnarl.patch | 10 + dev-ada/langkit/langkit-22.0.0.ebuild| 50 dev-ada/langkit/metadata.xml | 17 4 files changed, 78 insertions(+) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest new file mode 100644 index ..ea7b6a9fbab0 --- /dev/null +++ b/dev-ada/langkit/Manifest @@ -0,0 +1 @@ +DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909 diff --git a/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch b/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch new file mode 100644 index ..fb69768dc9de --- /dev/null +++ b/dev-ada/langkit/files/langkit-22.0.0-gnarl.patch @@ -0,0 +1,10 @@ +--- a/langkit/templates/mains_project_file.mako2020-06-09 09:34:36.677265457 +0200 b/langkit/templates/mains_project_file.mako2020-06-09 09:35:30.569451995 +0200 +@@ -40,4 +40,7 @@ + for Switches ("ada") use ("-E"); +end Binder; + ++ package Linker is ++ for Switches ("ada") use ("-lgnat", "-lgnarl"); ++ end Linker; + end Mains; diff --git a/dev-ada/langkit/langkit-22.0.0.ebuild b/dev-ada/langkit/langkit-22.0.0.ebuild new file mode 100644 index ..2fe1c770f737 --- /dev/null +++ b/dev-ada/langkit/langkit-22.0.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) + +DISTUTILS_USE_SETUPTOOLS=no +inherit distutils-r1 multiprocessing + +DESCRIPTION="A Python framework to generate language parsers" +HOMEPAGE="https://www.adacore.com/community; +SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +RESTRICT="test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-ada/gnatcoll-bindings[iconv,shared] + dev-python/mako[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/funcy[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-ada/e3-core[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-gnarl.patch +) + +src_compile() { + gprbuild -v -P support/langkit_support.gpr -p -j$(makeopts_jobs) \ + -XBUILD_MODE=dev -XLIBRARY_TYPE=relocatable -cargs:Ada ${ADAFLAGS} \ + || die + distutils-r1_src_compile +} + +src_install() { + gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \ + --prefix="${D}"/usr --build-var=LIBRARY_TYPE \ + --build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \ + --sources-subdir=include/langkit_support \ + -XLIBRARY_TYPE=relocatable --build-name=relocatable || die + distutils-r1_src_install +} diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml new file mode 100644 index ..1d15b41d3ff8 --- /dev/null +++ b/dev-ada/langkit/metadata.xml @@ -0,0 +1,17 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + a...@gentoo.org + + + Langkit (nickname for language kit) is a tool whose purpose is to make + it easy to create syntactic and semantic analysis engines. Write a + language specification in our Python DSL and Langkit will generate for + you an Ada library with bindings for the C and Python programming + languages. + The generated library is meant to provide a basis to write tooling, + including tools working on potentially changing and incorrect code, + such as IDEs. + +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/, profiles/
commit: a75c19a9f18fa8e8119828cd43536d316ced230c Author: Michał Górny gentoo org> AuthorDate: Sat Jan 30 23:48:21 2021 + Commit: Michał Górny gentoo org> CommitDate: Sun Jan 31 00:06:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75c19a9 dev-ada/langkit: Remove last-rited pkg Closes: https://bugs.gentoo.org/708338 Signed-off-by: Michał Górny gentoo.org> dev-ada/langkit/Manifest| 2 - dev-ada/langkit/files/langkit-2018-gentoo.patch | 60 - dev-ada/langkit/files/langkit-2019-gentoo.patch | 71 - dev-ada/langkit/files/langkit-2019-gnarl.patch | 10 dev-ada/langkit/files/langkit-2019-pyyaml.patch | 11 dev-ada/langkit/langkit-2018.ebuild | 49 - dev-ada/langkit/langkit-2019-r1.ebuild | 52 -- dev-ada/langkit/langkit-2019.ebuild | 51 -- dev-ada/langkit/metadata.xml| 17 -- profiles/package.mask | 8 --- 10 files changed, 331 deletions(-) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest deleted file mode 100644 index 325726889af..000 --- a/dev-ada/langkit/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b -DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch deleted file mode 100644 index 62ff7ce17e5..000 --- a/dev-ada/langkit/files/langkit-2018-gentoo.patch +++ /dev/null @@ -1,60 +0,0 @@ a/langkit/compile_context.py 2018-07-04 19:17:08.329346507 +0200 -+++ b/langkit/compile_context.py 2018-07-04 19:17:57.276615724 +0200 -@@ -1684,7 +1684,7 @@ - generate_lexer - ): - quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py") --subprocess.check_call([sys.executable, quex_py_file, "-i", -+subprocess.check_call(["quex", "-i", -quex_file, -"-o", "quex_lexer", -"--buffer-element-size", "4", a/langkit/libmanage.py 2018-11-20 21:38:03.042086783 +0100 -+++ b/langkit/libmanage.py 2018-11-20 21:39:50.562273656 +0100 -@@ -682,6 +682,8 @@ - - result = ['-XBUILD_MODE={}'.format(build_mode), - '-XLIBRARY_TYPE={}'.format(library_type), -+ '-XGPR_BUILD={}'.format(library_type), -+ '-XGNATCOLL_CORE_BUILD={}'.format(library_type), - '-XXMLADA_BUILD={}'.format(library_type)] - - enable_build_warnings = getattr(args, 'enable_build_warnings', False) a/testsuite/python_support/utils.py2018-11-20 21:41:46.156324084 +0100 -+++ b/testsuite/python_support/utils.py2018-11-20 21:42:26.049651194 +0100 -@@ -203,7 +203,8 @@ - main_sources=', '.join('"{}"'.format(m) for m in ada_main) - )) - run('gprbuild', '-Pgen', '-q', '-p', --'-XLIBRARY_TYPE=relocatable', '-XXMLADA_BUILD=relocatable') -+'-XLIBRARY_TYPE=relocatable', '-XGPR_BUILD=relocatable', -+'-XXMLADA_BUILD=relocatable') - - for i, m in enumerate(ada_main): - assert m.endswith('.adb') a/testsuite/testsuite_support/__init__.py 2018-11-20 21:45:08.828905205 +0100 -+++ b/testsuite/testsuite_support/__init__.py 2018-11-20 21:46:10.837858988 +0100 -@@ -110,7 +110,9 @@ - # Build Langkit_Support so that each testcase does not try to build it - # in parallel. - if not self.global_env['options'].disable_tear_up_builds: --gargs = ['-p', '-P', self.langkit_support_project_file] -+gargs = ['-p'] -+gargs = gargs + ['-XGPR_BUILD=relocatable'] -+gargs = gargs + ['-P', self.langkit_support_project_file] - cargs = ['-cargs', '-O0', '-g'] - if self.coverage_enabled: - gargs.append('--subdirs=gnatcov') a/testsuite/testsuite_support/base_driver.py 2018-11-20 22:04:54.199973719 +0100 -+++ b/testsuite/testsuite_support/base_driver.py 2018-11-20 22:05:26.498436100 +0100 -@@ -312,7 +312,9 @@ - - :param str project_file: Project file name. - """ --argv = ['gprbuild', '-P',
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/, dev-ada/langkit/
commit: 2920b98113125ea46feabcba8e2360be107b0d6c Author: Alfredo Tupone gentoo org> AuthorDate: Tue Jun 9 11:34:03 2020 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jun 9 11:34:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2920b981 dev-ada/langkit: add -lgnarl & -lgnat for incoming gprbuild Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/files/langkit-2019-gnarl.patch | 10 + dev-ada/langkit/langkit-2019-r1.ebuild | 52 ++ 2 files changed, 62 insertions(+) diff --git a/dev-ada/langkit/files/langkit-2019-gnarl.patch b/dev-ada/langkit/files/langkit-2019-gnarl.patch new file mode 100644 index 000..fb69768dc9d --- /dev/null +++ b/dev-ada/langkit/files/langkit-2019-gnarl.patch @@ -0,0 +1,10 @@ +--- a/langkit/templates/mains_project_file.mako2020-06-09 09:34:36.677265457 +0200 b/langkit/templates/mains_project_file.mako2020-06-09 09:35:30.569451995 +0200 +@@ -40,4 +40,7 @@ + for Switches ("ada") use ("-E"); +end Binder; + ++ package Linker is ++ for Switches ("ada") use ("-lgnat", "-lgnarl"); ++ end Linker; + end Mains; diff --git a/dev-ada/langkit/langkit-2019-r1.ebuild b/dev-ada/langkit/langkit-2019-r1.ebuild new file mode 100644 index 000..1f7676ec30e --- /dev/null +++ b/dev-ada/langkit/langkit-2019-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-single-r1 multiprocessing + +MYP=${P}-20190510-19B8C + +DESCRIPTION="A Python framework to generate language parsers" +HOMEPAGE="https://www.adacore.com/community; +SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8f8a31e87a8f1c967d31 + -> ${MYP}-src.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-ada/gnatcoll-bindings[iconv,shared] + dev-python/mako + dev-python/pyyaml + dev-python/enum34 + dev-python/funcy + dev-python/docutils" + +DEPEND="${RDEPEND} + test? ( dev-ada/gnatcoll-bindings[gmp] )" + +S="${WORKDIR}"/${MYP}-src + +PATCHES=( + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${P}-pyyaml.patch + "${FILESDIR}"/${P}-gnarl.patch +) + +src_test() { + testsuite/testsuite.py -j $(makeopts_jobs) --show-error-output | tee testsuite.log + grep -q FAILED testsuite.log && die "Test failed" +} + +src_install() { + default + python_domodule langkit + python_doscript scripts/create-project.py +}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/, dev-ada/langkit/
commit: 9581a0b568efbe0f22efde7bf54d66024e159ebc Author: Tupone Alfredo gentoo org> AuthorDate: Thu Mar 26 19:50:28 2020 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Mar 26 19:50:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9581a0b5 dev-ada/langkit: fix usage of pyyaml Closes: https://bugs.gentoo.org/713340 Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/files/langkit-2019-pyyaml.patch | 11 +++ dev-ada/langkit/langkit-2018.ebuild | 8 +--- dev-ada/langkit/langkit-2019.ebuild | 9 ++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dev-ada/langkit/files/langkit-2019-pyyaml.patch b/dev-ada/langkit/files/langkit-2019-pyyaml.patch new file mode 100644 index 000..58a64992a7c --- /dev/null +++ b/dev-ada/langkit/files/langkit-2019-pyyaml.patch @@ -0,0 +1,11 @@ +--- a/testsuite/testsuite_support/polyfill.py 2020-03-26 20:43:40.861154768 +0100 b/testsuite/testsuite_support/polyfill.py 2020-03-26 20:44:07.874675123 +0100 +@@ -376,7 +376,7 @@ + # First load data provided by this testcase + try: + with open(os.path.join(test_dir, 'test.yaml'), 'r') as f: +-test_data = yaml.load(f) ++test_data = yaml.safe_load(f) + except (IOError, yaml.error.YAMLError) as exc: + status = 'PROBLEM' + message = 'Invalid test.yaml: {}'.format(exc) diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild index 348ef449845..743c42e819d 100644 --- a/dev-ada/langkit/langkit-2018.ebuild +++ b/dev-ada/langkit/langkit-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -24,7 +24,6 @@ DEPEND="${PYTHON_DEPS} dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako dev-python/pyyaml -
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: bfde10116608a0d05a55b29a783ebe1a688595fa Author: Tupone Alfredo gentoo org> AuthorDate: Fri Nov 15 07:24:03 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Nov 15 07:24:03 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfde1011 dev-ada/langkit: fix MissingTestRestrict Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-2019.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild index 07c0444b168..229fdd526dc 100644 --- a/dev-ada/langkit/langkit-2019.ebuild +++ b/dev-ada/langkit/langkit-2019.ebuild @@ -18,6 +18,7 @@ LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" IUSE="test" +RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: 17f07cd9da176bc52795eeff3152d2ba3546873c Author: Tupone Alfredo gentoo org> AuthorDate: Sun Nov 3 20:28:17 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Nov 3 20:28:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f07cd9 dev-ada/langkit: Remove old version Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/Manifest| 1 - dev-ada/langkit/files/langkit-2017-gentoo.patch | 69 - dev-ada/langkit/langkit-2017.ebuild | 45 3 files changed, 115 deletions(-) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index da77d80482b..325726889af 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1,3 +1,2 @@ DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f -DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch deleted file mode 100644 index 7b6501ed8a7..000 --- a/dev-ada/langkit/files/langkit-2017-gentoo.patch +++ /dev/null @@ -1,69 +0,0 @@ a/langkit/compile_context.py 2017-12-13 22:12:38.689143125 +0100 -+++ b/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100 -@@ -1171,8 +1171,7 @@ - # the Quex specification changed from last build. - if generate_lexer and self.cache.is_stale('quex_specification', - quex_spec): --quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py") --subprocess.check_call([sys.executable, quex_py_file, "-i", -+subprocess.check_call(["quex", "-i", -quex_file, -"-o", "quex_lexer", -"--buffer-element-size", "4", a/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:28.461617512 +0100 -+++ b/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:58.912060490 +0100 -@@ -2196,7 +2196,7 @@ --- printing them. - -function Hash (S : Lexical_Env) return Hash_Type is -- (Hash_Type (To_Integer (S.all'Address))); -+ (Hash_Type'Mod (To_Integer (S.all'Address))); - -package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps - (Lexical_Env, Integer, Hash, "="); a/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:04.977442020 +0200 -+++ b/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:45.422759387 +0200 -@@ -68,6 +68,8 @@ - # to build it in parallel. - if not self.global_env['options'].disable_tear_up_builds: --p = Run(['gprbuild', '-p', '-f', '-P', -+p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable', -+ '-XGPR_BUILD=relocatable', -+ '-XXMLADA_BUILD=relocatable', '-P', - os.path.join(self.root_dir, '..', 'langkit', 'support', - 'langkit_support.gpr')], output=PIPE) - report(p, "Langkit support") a/testsuite/testsuite_support/langkit_support_driver.py2018-05-03 08:01:20.019944992 +0200 -+++ b/testsuite/testsuite_support/langkit_support_driver.py2018-05-03 08:02:50.146430288 +0200 -@@ -36,5 +36,8 @@ - )) - - self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata', -+'-XLIBRARY_TYPE=relocatable', -+'-XGPR_BUILD=relocatable', -+'-XXMLADA_BUILD=relocatable', - '-cargs', '-O0', '-g']) - self.run_and_check(['./{}'.format(source[:-4])]) -+++ a/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:14:30.998698722 +0200 b/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:16:48.275417176 +0200 -@@ -41,6 +41,9 @@ - ) - )) - --self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0', -+
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 0a35416afa79b90dd6127f857400078484ee2833 Author: Tupone Alfredo gentoo org> AuthorDate: Fri Oct 18 17:14:19 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Oct 18 17:14:19 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a35416a dev-ada/langkit: stable Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/langkit/langkit-2019.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild index 72bcd4d3adb..07c0444b168 100644 --- a/dev-ada/langkit/langkit-2019.ebuild +++ b/dev-ada/langkit/langkit-2019.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5cdf8f8a31e87a8f1c967d31 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 6d2d3967e7bebe1a6408a43c27306830e15a8d5b Author: Tupone Alfredo gentoo org> AuthorDate: Sun Jul 7 19:57:09 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Jul 7 19:57:09 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2d3967 dev-ada/langkit: fix dependency and try to respect -j1 Bug: https://bugs.gentoo.org/677816 Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-ada/langkit/langkit-2018.ebuild | 5 +++-- dev-ada/langkit/langkit-2019.ebuild | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild index 6fe74a78bc9..348ef449845 100644 --- a/dev-ada/langkit/langkit-2018.ebuild +++ b/dev-ada/langkit/langkit-2018.ebuild @@ -5,7 +5,7 @@ EAPI=6 PYTHON_COMPAT=( python2_7 ) -inherit python-single-r1 +inherit python-single-r1 multiprocessing MYP=${PN}-gpl-${PV} @@ -24,6 +24,7 @@ DEPEND="${PYTHON_DEPS} dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako dev-python/pyyaml +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 4aa16f974062664dd4ff05c14e0bfb10f93c8e3d Author: Tupone Alfredo gentoo org> AuthorDate: Tue Jun 18 06:07:34 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jun 18 06:07:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aa16f97 dev-ada/langkit: more log for test phase Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-ada/langkit/langkit-2018.ebuild | 5 +++-- dev-ada/langkit/langkit-2019.ebuild | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild index 3eeaca02add..6fe74a78bc9 100644 --- a/dev-ada/langkit/langkit-2018.ebuild +++ b/dev-ada/langkit/langkit-2018.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -35,7 +35,8 @@ S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_test() { - testsuite/testsuite.py | grep FAILED && die "Test failed" + testsuite/testsuite.py --show-error-output | tee testsuite.log + grep -q FAILED testsuite.log && die "Test failed" } src_install() { diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild index a3dcb795c06..1cc699ee20a 100644 --- a/dev-ada/langkit/langkit-2019.ebuild +++ b/dev-ada/langkit/langkit-2019.ebuild @@ -36,7 +36,7 @@ S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) src_test() { - testsuite/testsuite.py --show-error-output misc | tee testsuite.log + testsuite/testsuite.py --show-error-output | tee testsuite.log grep -q FAILED testsuite.log && die "Test failed" }
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: 8c1830d5a146f733d7cfb2feea8d56a2568e8a7a Author: Tupone Alfredo gentoo org> AuthorDate: Mon Jun 17 07:51:34 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Mon Jun 17 07:51:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1830d5 dev-ada/langkit: assign to ada gentoo.org Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-ada/langkit/files/langkit-2019-gentoo.patch | 11 +++ dev-ada/langkit/langkit-2019.ebuild | 8 +--- dev-ada/langkit/metadata.xml| 5 ++--- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dev-ada/langkit/files/langkit-2019-gentoo.patch b/dev-ada/langkit/files/langkit-2019-gentoo.patch index 13a5eb9df23..0358198d080 100644 --- a/dev-ada/langkit/files/langkit-2019-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2019-gentoo.patch @@ -58,3 +58,14 @@ '-XXMLADA_BUILD={}'.format(library_type)] enable_build_warnings = getattr(args, 'enable_build_warnings', False) +--- a/testsuite/tests/misc/link_two_libs/test.yaml 2019-06-17 09:38:34.796029233 +0200 b/testsuite/tests/misc/link_two_libs/test.yaml 2019-06-17 09:39:06.805549633 +0200 +@@ -1,7 +1,3 @@ + driver: python + input_sources: [] +-expect_failure: +- - if: [gnat_community_2018] +-then: > +- A known issue in the gprbuild furnished with GNAT Community 2018 +- prevents this test from passing. ++expect_failure: Gentoo failure diff --git a/dev-ada/langkit/langkit-2019.ebuild b/dev-ada/langkit/langkit-2019.ebuild index b18dc16f8d4..a3dcb795c06 100644 --- a/dev-ada/langkit/langkit-2019.ebuild +++ b/dev-ada/langkit/langkit-2019.ebuild @@ -35,14 +35,8 @@ S="${WORKDIR}"/${MYP}-src PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) -src_prepare() { - default - # Can't make this test working - rm -r testsuite/tests/misc/link_two_libs || die -} - src_test() { - testsuite/testsuite.py --show-error-output | tee testsuite.log + testsuite/testsuite.py --show-error-output misc | tee testsuite.log grep -q FAILED testsuite.log && die "Test failed" } diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml index bfb9cb6484b..1d15b41d3ff 100644 --- a/dev-ada/langkit/metadata.xml +++ b/dev-ada/langkit/metadata.xml @@ -1,9 +1,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - tup...@gentoo.org - Tupone Alfredo + + a...@gentoo.org Langkit (nickname for language kit) is a tool whose purpose is to make
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: 4bb8e1790045df50a188cba0130131c143d7cc7e Author: Tupone Alfredo gentoo org> AuthorDate: Sun Jun 9 19:02:36 2019 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Jun 9 19:02:36 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bb8e179 dev-ada/langkit: bump to 2019 Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-ada/langkit/Manifest| 1 + dev-ada/langkit/files/langkit-2019-gentoo.patch | 60 + dev-ada/langkit/langkit-2019.ebuild | 53 ++ 3 files changed, 114 insertions(+) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index bdd44e3183f..da77d80482b 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1,2 +1,3 @@ +DIST langkit-2019-20190510-19B8C-src.tar.gz 699205 BLAKE2B 770f904cf2a2014dc6ed6383d3be51361a311d1feb5d594bf9e81ab80a01835ac0b24cd743539a70dff2120307b25a61f781586b504d910401018afcf3b8ae7b SHA512 fbaac1b6407292396711d3deba3a7b5eef6655b877c5515a3653699decdbb2c9824b42bb8e9680122a3ac6ac3eb605333eda7c0265fafd6ab2d117f932790b3b DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 diff --git a/dev-ada/langkit/files/langkit-2019-gentoo.patch b/dev-ada/langkit/files/langkit-2019-gentoo.patch new file mode 100644 index 000..13a5eb9df23 --- /dev/null +++ b/dev-ada/langkit/files/langkit-2019-gentoo.patch @@ -0,0 +1,60 @@ +--- a/testsuite/testsuite_support/__init__.py 2019-06-09 12:47:22.832308224 +0200 b/testsuite/testsuite_support/__init__.py 2019-06-09 12:48:27.768399377 +0200 +@@ -126,8 +126,10 @@ + # Build Langkit_Support so that each testcase does not try to build it + # in parallel. + if not self.global_env['options'].disable_tear_up_builds: +-gargs = ['-p', '-P', self.langkit_support_project_file] ++gargs = ['-p'] ++gargs = gargs + ['-XGPR_BUILD=relocatable'] ++gargs = gargs + ['-P', self.langkit_support_project_file] +-cargs = ['-cargs', '-O0', '-g', '-gnatwae'] ++cargs = ['-cargs', '-O0', '-g', '-gnatwa'] + if self.coverage_enabled: + gargs.append('--subdirs=gnatcov') + cargs.extend(['-fdump-scos', '-fpreserve-control-flow']) +--- a/langkit/support/langkit_support.gpr 2019-06-09 14:00:50.239979207 +0200 b/langkit/support/langkit_support.gpr 2019-06-09 14:00:56.580879634 +0200 +@@ -8,7 +8,7 @@ +for Object_Dir use "obj"; + +package Compiler is +- for Default_Switches ("Ada") use ("-gnatwae", "-gnatyg"); ++ for Default_Switches ("Ada") use ("-gnatws", "-gnatyg"); +end Compiler; + + end Langkit_Support; +--- a/langkit/templates/langkit_support_gpr.mako 2019-06-09 19:07:51.131902613 +0200 b/langkit/templates/langkit_support_gpr.mako 2019-06-09 19:09:55.530096368 +0200 +@@ -61,7 +61,7 @@ + case Build_Mode is + when "dev" => + for Default_Switches ("Ada") use +- Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata"); ++ Common_Ada_Cargs & ("-g", "-O0", "-gnatws", "-gnata"); + + when "prod" => + -- Debug information is useful even with optimization for +--- a/testsuite/testsuite_support/base_driver.py 2019-06-09 20:00:21.202461893 +0200 b/testsuite/testsuite_support/base_driver.py 2019-06-09 20:01:04.516848550 +0200 +@@ -327,7 +327,9 @@ + + :param str project_file: Project file name. + """ +-argv = ['gprbuild', '-P', project_file, '-p'] ++argv = ['gprbuild'] ++argv = argv + ['-XGPR_BUILD=relocatable'] ++argv = argv + ['-P', project_file, '-p'] + cargs = ['-O0', '-g', '-gnata'] + if self.coverage_enabled: + argv.append('--subdirs=gnatcov') +--- a/langkit/libmanage.py 2019-06-09 20:40:14.885582672 +0200 b/langkit/libmanage.py 2019-06-09 20:41:13.991738858 +0200 +@@ -745,6 +745,7 @@ + result = ['-XBUILD_MODE={}'.format(build_mode), + '-XLIBRARY_TYPE={}'.format(library_type), + '-XGPR_BUILD={}'.format(library_type), ++ '-XGNATCOLL_GMP_BUILD={}'.format(library_type), + '-XXMLADA_BUILD={}'.format(library_type)] + +
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: 3eb3db68d752e9a14b070ef95652f4c368b46e65 Author: Tupone Alfredo gentoo org> AuthorDate: Thu Nov 22 07:04:45 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Nov 22 07:04:45 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb3db68 dev-ada/langkit: Stable Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ada/langkit/files/langkit-2018-gentoo.patch | 49 + dev-ada/langkit/langkit-2018.ebuild | 9 ++--- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch index 52920e906ee..62ff7ce17e5 100644 --- a/dev-ada/langkit/files/langkit-2018-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch @@ -9,3 +9,52 @@ quex_file, "-o", "quex_lexer", "--buffer-element-size", "4", +--- a/langkit/libmanage.py 2018-11-20 21:38:03.042086783 +0100 b/langkit/libmanage.py 2018-11-20 21:39:50.562273656 +0100 +@@ -682,6 +682,8 @@ + + result = ['-XBUILD_MODE={}'.format(build_mode), + '-XLIBRARY_TYPE={}'.format(library_type), ++ '-XGPR_BUILD={}'.format(library_type), ++ '-XGNATCOLL_CORE_BUILD={}'.format(library_type), + '-XXMLADA_BUILD={}'.format(library_type)] + + enable_build_warnings = getattr(args, 'enable_build_warnings', False) +--- a/testsuite/python_support/utils.py2018-11-20 21:41:46.156324084 +0100 b/testsuite/python_support/utils.py2018-11-20 21:42:26.049651194 +0100 +@@ -203,7 +203,8 @@ + main_sources=', '.join('"{}"'.format(m) for m in ada_main) + )) + run('gprbuild', '-Pgen', '-q', '-p', +-'-XLIBRARY_TYPE=relocatable', '-XXMLADA_BUILD=relocatable') ++'-XLIBRARY_TYPE=relocatable', '-XGPR_BUILD=relocatable', ++'-XXMLADA_BUILD=relocatable') + + for i, m in enumerate(ada_main): + assert m.endswith('.adb') +--- a/testsuite/testsuite_support/__init__.py 2018-11-20 21:45:08.828905205 +0100 b/testsuite/testsuite_support/__init__.py 2018-11-20 21:46:10.837858988 +0100 +@@ -110,7 +110,9 @@ + # Build Langkit_Support so that each testcase does not try to build it + # in parallel. + if not self.global_env['options'].disable_tear_up_builds: +-gargs = ['-p', '-P', self.langkit_support_project_file] ++gargs = ['-p'] ++gargs = gargs + ['-XGPR_BUILD=relocatable'] ++gargs = gargs + ['-P', self.langkit_support_project_file] + cargs = ['-cargs', '-O0', '-g'] + if self.coverage_enabled: + gargs.append('--subdirs=gnatcov') +--- a/testsuite/testsuite_support/base_driver.py 2018-11-20 22:04:54.199973719 +0100 b/testsuite/testsuite_support/base_driver.py 2018-11-20 22:05:26.498436100 +0100 +@@ -312,7 +312,9 @@ + + :param str project_file: Project file name. + """ +-argv = ['gprbuild', '-P', project_file, '-p'] ++argv = ['gprbuild'] ++argv = argv + ['-XGPR_BUILD=relocatable'] ++argv = argv + ['-P', project_file, '-p'] + cargs = ['-O0', '-g', '-gnata'] + if self.coverage_enabled: + argv.append('--subdirs=gnatcov') diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild index 9bb818cf2e8..3eeaca02add 100644 --- a/dev-ada/langkit/langkit-2018.ebuild +++ b/dev-ada/langkit/langkit-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 @@ -16,15 +16,12 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} - || ( - dev-ada/gnatcoll[gnat_2017,iconv,shared] - dev-ada/gnatcoll-bindings[gnat_2018,iconv,shared] - ) + dev-ada/gnatcoll-bindings[iconv,shared] dev-python/mako dev-python/pyyaml dev-python/enum34
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
commit: 09396b5f7b62226bce1a0d36dfa14a796c8fd759 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Nov 14 21:41:54 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Nov 14 21:41:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09396b5f dev-ada/langkit: Fx build with new libgpr Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ada/langkit/files/langkit-2017-gentoo.patch | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch index bc744d8ded5..7b6501ed8a7 100644 --- a/dev-ada/langkit/files/langkit-2017-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch @@ -23,34 +23,47 @@ (Lexical_Env, Integer, Hash, "="); --- a/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:04.977442020 +0200 +++ b/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:45.422759387 +0200 -@@ -68,6 +68,7 @@ +@@ -68,6 +68,8 @@ # to build it in parallel. if not self.global_env['options'].disable_tear_up_builds: -p = Run(['gprbuild', '-p', '-f', '-P', +p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable', ++ '-XGPR_BUILD=relocatable', + '-XXMLADA_BUILD=relocatable', '-P', os.path.join(self.root_dir, '..', 'langkit', 'support', 'langkit_support.gpr')], output=PIPE) report(p, "Langkit support") --- a/testsuite/testsuite_support/langkit_support_driver.py2018-05-03 08:01:20.019944992 +0200 +++ b/testsuite/testsuite_support/langkit_support_driver.py2018-05-03 08:02:50.146430288 +0200 -@@ -36,5 +36,7 @@ +@@ -36,5 +36,8 @@ )) self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata', +'-XLIBRARY_TYPE=relocatable', ++'-XGPR_BUILD=relocatable', +'-XXMLADA_BUILD=relocatable', '-cargs', '-O0', '-g']) self.run_and_check(['./{}'.format(source[:-4])]) +++ a/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:14:30.998698722 +0200 --- b/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:16:48.275417176 +0200 -@@ -41,6 +41,8 @@ +@@ -41,6 +41,9 @@ ) )) -self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0', +self.run_and_check(['gprbuild', '-p', '-XLIBRARY_TYPE=relocatable', ++'-XGPR_BUILD=relocatable', +'-XXMLADA_BUILD=relocatable', +'-P', 'p.gpr', '-cargs', '-O0', '-g']) self.run_and_check(['./{}'.format(source[:-4])]) +--- a/langkit/libmanage.py 2018-11-14 22:02:20.283672719 +0100 b/langkit/libmanage.py 2018-11-14 22:02:39.970337338 +0100 +@@ -634,6 +634,7 @@ + + result = ['-XBUILD_MODE={}'.format(build_mode), + '-XLIBRARY_TYPE={}'.format(library_type), ++ '-XGPR_BUILD={}'.format(library_type), + '-XXMLADA_BUILD={}'.format(library_type)] + + enable_warnings = getattr(args, 'enable_warnings', False)
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 6571da18b3550a5f028a2c53122c7bba77939651 Author: Tupone Alfredo gentoo org> AuthorDate: Sun Nov 11 20:33:18 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Nov 11 20:33:18 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6571da18 dev-ada/langkit: work with gnat_2016 too Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ada/langkit/langkit-2017.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild index df6770a0d6b..57790df219e 100644 --- a/dev-ada/langkit/langkit-2017.ebuild +++ b/dev-ada/langkit/langkit-2017.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 @@ -21,7 +21,7 @@ IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} - dev-ada/gnatcoll[gnat_2017,iconv,shared] + dev-ada/gnatcoll[iconv,shared] dev-python/mako dev-python/pyyaml dev-python/enum34
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
commit: 2ef1f0e5e5bd0724077a50e400c8496bb24cfb23 Author: Tupone Alfredo gentoo org> AuthorDate: Sun Nov 11 20:26:54 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Nov 11 20:26:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef1f0e5 dev-ada/langkit: remove hack for gcc Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ada/langkit/files/langkit-2017-gentoo.patch | 38 + 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch index ecb7ce6e74d..bc744d8ded5 100644 --- a/dev-ada/langkit/files/langkit-2017-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch @@ -1,29 +1,5 @@ langkit-gps-src/langkit/templates/project_file.mako.old2017-07-11 14:19:12.841221846 +0200 -+++ langkit-gps-src/langkit/templates/project_file.mako2017-07-11 14:12:39.104981170 +0200 -@@ -82,9 +82,11 @@ - for Default_Switches ("Ada") use -Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata"); - --for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0"); -+for Default_Switches ("C") use Common_C_Cargs & -+ ("-g3", "-O0", "-fPIC"); - --for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0"); -+for Switches ("quex_lexer.c") use Common_C_Cargs & -+ ("-g0", "-O0", "-fPIC"); - -- This file is *huge* and the debugging information for it harms - -- Valgrind runs. We almost never have to debug this file so - -- this is acceptable. -@@ -111,6 +111,7 @@ - -- ... and this prevents OOM on other platforms - end case; - end case; -+ for Driver ("C") use External ("GCC", "gcc"); -end Compiler; - -package Binder is langkit-gps-src/langkit/compile_context.py.old 2017-12-13 22:12:38.689143125 +0100 -+++ langkit-gps-src/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100 +--- a/langkit/compile_context.py 2017-12-13 22:12:38.689143125 +0100 b/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100 @@ -1171,8 +1171,7 @@ # the Quex specification changed from last build. if generate_lexer and self.cache.is_stale('quex_specification', @@ -34,8 +10,8 @@ quex_file, "-o", "quex_lexer", "--buffer-element-size", "4", langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako.old 2017-12-26 20:47:28.461617512 +0100 -+++ langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:58.912060490 +0100 +--- a/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:28.461617512 +0100 b/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:58.912060490 +0100 @@ -2196,7 +2196,7 @@ -- printing them. @@ -45,7 +21,7 @@ package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps (Lexical_Env, Integer, Hash, "="); a/testsuite/testsuite_support/__init__.py.old 2018-05-02 21:40:04.977442020 +0200 +--- a/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:04.977442020 +0200 +++ b/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:45.422759387 +0200 @@ -68,6 +68,7 @@ # to build it in parallel. @@ -56,7 +32,7 @@ os.path.join(self.root_dir, '..', 'langkit', 'support', 'langkit_support.gpr')], output=PIPE) report(p, "Langkit support") a/testsuite/testsuite_support/langkit_support_driver.py.old 2018-05-03 08:01:20.019944992 +0200 +--- a/testsuite/testsuite_support/langkit_support_driver.py2018-05-03 08:01:20.019944992 +0200 +++ b/testsuite/testsuite_support/langkit_support_driver.py2018-05-03 08:02:50.146430288 +0200 @@ -36,5 +36,7 @@ )) @@ -66,7 +42,7 @@ +'-XXMLADA_BUILD=relocatable', '-cargs', '-O0', '-g']) self.run_and_check(['./{}'.format(source[:-4])]) -+++ a/testsuite/testsuite_support/adalog_driver.py.old 2018-05-03 08:14:30.998698722 +0200 a/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:14:30.998698722 +0200 --- b/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:16:48.275417176 +0200 @@ -41,6 +41,8 @@ )
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
commit: 0578333a540ea97c58f893d04d70c84846676125 Author: Tupone Alfredo gentoo org> AuthorDate: Sun Oct 14 18:54:08 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Oct 14 18:54:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0578333a dev-ada/langkit: Remove c driver from template Signed-off-by: Alfredo Tupone gentoo.org> Package-Manager: Portage-2.3.49, Repoman-2.3.11 dev-ada/langkit/files/langkit-2018-gentoo.patch | 10 -- 1 file changed, 10 deletions(-) diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch index aacca6092c1..52920e906ee 100644 --- a/dev-ada/langkit/files/langkit-2018-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch @@ -1,13 +1,3 @@ a/langkit/templates/project_file.mako 2017-07-11 14:19:12.841221846 +0200 -+++ b/langkit/templates/project_file.mako 2017-07-11 14:12:39.104981170 +0200 -@@ -111,6 +111,7 @@ - -- ... and this prevents OOM on other platforms - end case; - end case; -+ for Driver ("C") use External ("GCC", "gcc"); -end Compiler; - -package Binder is --- a/langkit/compile_context.py 2018-07-04 19:17:08.329346507 +0200 +++ b/langkit/compile_context.py 2018-07-04 19:17:57.276615724 +0200 @@ -1684,7 +1684,7 @@
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: da6d489e7b1ac17110c9727b1ddd451fb6012b58 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Jul 4 19:16:40 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Jul 4 19:16:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6d489e dev-ada/langkit: Add 2018 version Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-ada/langkit/Manifest| 1 + dev-ada/langkit/files/langkit-2018-gentoo.patch | 21 +++ dev-ada/langkit/langkit-2018.ebuild | 48 + 3 files changed, 70 insertions(+) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest index e7ad949e03c..bdd44e3183f 100644 --- a/dev-ada/langkit/Manifest +++ b/dev-ada/langkit/Manifest @@ -1 +1,2 @@ +DIST langkit-gpl-2018.tar.gz 565649 BLAKE2B e18beea565351eb4b10baa9168db742598817d231c5eab578b17c2b0409ac77b9972f8f426499e086779eaeda0ac1ba11e5cb3b47ecab8e63674b7ef654b26b7 SHA512 62a8820c3fd3d44f6cd22e181f6eddcf52945c93ea5eb793a63b7f13e71705807170b0cc4c3873b127e3fafe751a5dd27da54087986f506f8500b916ef1f078f DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 diff --git a/dev-ada/langkit/files/langkit-2018-gentoo.patch b/dev-ada/langkit/files/langkit-2018-gentoo.patch new file mode 100644 index 000..aacca6092c1 --- /dev/null +++ b/dev-ada/langkit/files/langkit-2018-gentoo.patch @@ -0,0 +1,21 @@ +--- a/langkit/templates/project_file.mako 2017-07-11 14:19:12.841221846 +0200 b/langkit/templates/project_file.mako 2017-07-11 14:12:39.104981170 +0200 +@@ -111,6 +111,7 @@ + -- ... and this prevents OOM on other platforms + end case; + end case; ++ for Driver ("C") use External ("GCC", "gcc"); +end Compiler; + +package Binder is +--- a/langkit/compile_context.py 2018-07-04 19:17:08.329346507 +0200 b/langkit/compile_context.py 2018-07-04 19:17:57.276615724 +0200 +@@ -1684,7 +1684,7 @@ + generate_lexer + ): + quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py") +-subprocess.check_call([sys.executable, quex_py_file, "-i", ++subprocess.check_call(["quex", "-i", +quex_file, +"-o", "quex_lexer", +"--buffer-element-size", "4", diff --git a/dev-ada/langkit/langkit-2018.ebuild b/dev-ada/langkit/langkit-2018.ebuild new file mode 100644 index 000..9bb818cf2e8 --- /dev/null +++ b/dev-ada/langkit/langkit-2018.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-single-r1 + +MYP=${PN}-gpl-${PV} + +DESCRIPTION="A Python framework to generate language parsers" +HOMEPAGE="https://www.adacore.com/community; +SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cfbefc7a4475263382c2a + -> ${MYP}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + || ( + dev-ada/gnatcoll[gnat_2017,iconv,shared] + dev-ada/gnatcoll-bindings[gnat_2018,iconv,shared] + ) + dev-python/mako + dev-python/pyyaml + dev-python/enum34 + dev-python/funcy + dev-python/docutils + dev-python/quex" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYP}-src + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_test() { + testsuite/testsuite.py | grep FAILED && die "Test failed" +} + +src_install() { + default + python_domodule langkit + python_doscript scripts/create-project.py +}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
commit: 92c6a25e4985c815faf78d8fc1d15b4f4d7f930c Author: Tupone Alfredo gentoo org> AuthorDate: Thu May 3 06:29:50 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu May 3 06:31:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c6a25e dev-ada/langkit: Fix test when libgpr and xmlada are build with static-libs Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-ada/langkit/files/langkit-2017-gentoo.patch | 33 + 1 file changed, 33 insertions(+) diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch index e6609236b6c..ecb7ce6e74d 100644 --- a/dev-ada/langkit/files/langkit-2017-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch @@ -45,3 +45,36 @@ package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps (Lexical_Env, Integer, Hash, "="); +--- a/testsuite/testsuite_support/__init__.py.old 2018-05-02 21:40:04.977442020 +0200 b/testsuite/testsuite_support/__init__.py 2018-05-02 21:40:45.422759387 +0200 +@@ -68,6 +68,7 @@ + # to build it in parallel. + if not self.global_env['options'].disable_tear_up_builds: +-p = Run(['gprbuild', '-p', '-f', '-P', ++p = Run(['gprbuild', '-p', '-f', '-XLIBRARY_TYPE=relocatable', ++ '-XXMLADA_BUILD=relocatable', '-P', + os.path.join(self.root_dir, '..', 'langkit', 'support', + 'langkit_support.gpr')], output=PIPE) + report(p, "Langkit support") +--- a/testsuite/testsuite_support/langkit_support_driver.py.old 2018-05-03 08:01:20.019944992 +0200 b/testsuite/testsuite_support/langkit_support_driver.py2018-05-03 08:02:50.146430288 +0200 +@@ -36,5 +36,7 @@ + )) + + self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-gnata', ++'-XLIBRARY_TYPE=relocatable', ++'-XXMLADA_BUILD=relocatable', + '-cargs', '-O0', '-g']) + self.run_and_check(['./{}'.format(source[:-4])]) a/testsuite/testsuite_support/adalog_driver.py.old 2018-05-03 08:14:30.998698722 +0200 +--- b/testsuite/testsuite_support/adalog_driver.py 2018-05-03 08:16:48.275417176 +0200 +@@ -41,6 +41,8 @@ + ) + )) + +-self.run_and_check(['gprbuild', '-p', '-P', 'p.gpr', '-cargs', '-O0', ++self.run_and_check(['gprbuild', '-p', '-XLIBRARY_TYPE=relocatable', ++'-XXMLADA_BUILD=relocatable', ++'-P', 'p.gpr', '-cargs', '-O0', + '-g']) + self.run_and_check(['./{}'.format(source[:-4])])
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: 98caf760adc810b6759bdca714a13a7f4f4e5925 Author: Tupone Alfredo gentoo org> AuthorDate: Sun Apr 22 07:46:27 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Apr 22 07:46:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98caf760 dev-ada/langkit: amd64 and x86 stable Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-ada/langkit/langkit-2017.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild index 01cac92bcd4..df6770a0d6b 100644 --- a/dev-ada/langkit/langkit-2017.ebuild +++ b/dev-ada/langkit/langkit-2017.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: fe1ad8abd0b14aaf80b8ac83570f35d386664c37 Author: Tupone Alfredo gentoo org> AuthorDate: Sun Mar 11 16:35:40 2018 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Mar 11 16:35:40 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe1ad8ab dev-ada/langkit: Add ~x86 Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-ada/langkit/langkit-2017.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild index 90b59dbad41..01cac92bcd4 100644 --- a/dev-ada/langkit/langkit-2017.ebuild +++ b/dev-ada/langkit/langkit-2017.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044 LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}"
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/files/
commit: 536f37f77364a2a932f60e80780342b838c049be Author: Tupone Alfredo gentoo org> AuthorDate: Tue Dec 26 19:54:50 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Dec 26 19:54:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536f37f7 dev-ada/langkit: Fix constraint error on hash Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/langkit/files/langkit-2017-gentoo.patch | 11 +++ 1 file changed, 11 insertions(+) diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch index 0260d44c888..e6609236b6c 100644 --- a/dev-ada/langkit/files/langkit-2017-gentoo.patch +++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch @@ -34,3 +34,14 @@ quex_file, "-o", "quex_lexer", "--buffer-element-size", "4", +--- langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako.old 2017-12-26 20:47:28.461617512 +0100 langkit-gps-src/langkit/templates/pkg_analysis_body_ada.mako 2017-12-26 20:47:58.912060490 +0100 +@@ -2196,7 +2196,7 @@ +-- printing them. + +function Hash (S : Lexical_Env) return Hash_Type is +- (Hash_Type (To_Integer (S.all'Address))); ++ (Hash_Type'Mod (To_Integer (S.all'Address))); + +package Address_To_Id_Maps is new Ada.Containers.Hashed_Maps + (Lexical_Env, Integer, Hash, "=");
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/
commit: d6392db2ac39df0dfc0175b388f603e1889040ac Author: Tupone Alfredo gentoo org> AuthorDate: Sun Dec 24 11:19:56 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Dec 24 11:19:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6392db2 dev-ada/langkit: Needs dev-ada/gnatcoll built with shared library Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/langkit/langkit-2017.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild index 1d2558ae90d..90b59dbad41 100644 --- a/dev-ada/langkit/langkit-2017.ebuild +++ b/dev-ada/langkit/langkit-2017.ebuild @@ -21,7 +21,7 @@ IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND="${PYTHON_DEPS} - dev-ada/gnatcoll[gnat_2017,iconv] + dev-ada/gnatcoll[gnat_2017,iconv,shared] dev-python/mako dev-python/pyyaml dev-python/enum34
[gentoo-commits] repo/gentoo:master commit in: dev-ada/langkit/, dev-ada/langkit/files/
commit: df124d65f1c4eb996e4bff76d9b22f60d49a275f Author: Tupone Alfredo gentoo org> AuthorDate: Sat Dec 23 20:32:49 2017 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Dec 23 20:32:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df124d65 dev-ada/langkit: Add dev-ada/langkit Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-ada/langkit/Manifest| 1 + dev-ada/langkit/files/langkit-2017-gentoo.patch | 36 dev-ada/langkit/langkit-2017.ebuild | 45 + dev-ada/langkit/metadata.xml| 18 ++ 4 files changed, 100 insertions(+) diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest new file mode 100644 index 000..e7ad949e03c --- /dev/null +++ b/dev-ada/langkit/Manifest @@ -0,0 +1 @@ +DIST langkit-gps-src-2017.tar.gz 364589 BLAKE2B 14d80e904ded20a73d65a5828157ea82672559b5bb47e465381989ad3a6e90f41bd0c6db0a5e4f7b7c532fd4f697f9bc8cb3163c6e61106d0d44da994b1c7b28 SHA512 1c86e60710e4def3d430372eed11bf1a27bf82e84c7b787c5a0be15229b6e5f786dbdf830a311423dd7539841de3076d370afc8b4c1b0cddd1bc379372dcdc95 diff --git a/dev-ada/langkit/files/langkit-2017-gentoo.patch b/dev-ada/langkit/files/langkit-2017-gentoo.patch new file mode 100644 index 000..0260d44c888 --- /dev/null +++ b/dev-ada/langkit/files/langkit-2017-gentoo.patch @@ -0,0 +1,36 @@ +--- langkit-gps-src/langkit/templates/project_file.mako.old2017-07-11 14:19:12.841221846 +0200 langkit-gps-src/langkit/templates/project_file.mako2017-07-11 14:12:39.104981170 +0200 +@@ -82,9 +82,11 @@ + for Default_Switches ("Ada") use +Common_Ada_Cargs & ("-g", "-O0", "-gnatwe", "-gnata"); + +-for Default_Switches ("C") use Common_C_Cargs & ("-g3", "-O0"); ++for Default_Switches ("C") use Common_C_Cargs & ++ ("-g3", "-O0", "-fPIC"); + +-for Switches ("quex_lexer.c") use Common_C_Cargs & ("-g0", "-O0"); ++for Switches ("quex_lexer.c") use Common_C_Cargs & ++ ("-g0", "-O0", "-fPIC"); + -- This file is *huge* and the debugging information for it harms + -- Valgrind runs. We almost never have to debug this file so + -- this is acceptable. +@@ -111,6 +111,7 @@ + -- ... and this prevents OOM on other platforms + end case; + end case; ++ for Driver ("C") use External ("GCC", "gcc"); +end Compiler; + +package Binder is +--- langkit-gps-src/langkit/compile_context.py.old 2017-12-13 22:12:38.689143125 +0100 langkit-gps-src/langkit/compile_context.py 2017-12-13 22:13:02.446737994 +0100 +@@ -1171,8 +1171,7 @@ + # the Quex specification changed from last build. + if generate_lexer and self.cache.is_stale('quex_specification', + quex_spec): +-quex_py_file = path.join(os.environ["QUEX_PATH"], "quex-exe.py") +-subprocess.check_call([sys.executable, quex_py_file, "-i", ++subprocess.check_call(["quex", "-i", +quex_file, +"-o", "quex_lexer", +"--buffer-element-size", "4", diff --git a/dev-ada/langkit/langkit-2017.ebuild b/dev-ada/langkit/langkit-2017.ebuild new file mode 100644 index 000..1d2558ae90d --- /dev/null +++ b/dev-ada/langkit/langkit-2017.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-single-r1 + +MYPN=${PN}-gps-src + +DESCRIPTION="A Python framework to generate language parsers" +HOMEPAGE="https://www.adacore.com/community; +SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed044 + -> ${MYPN}-${PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + dev-ada/gnatcoll[gnat_2017,iconv] + dev-python/mako + dev-python/pyyaml + dev-python/enum34 + dev-python/funcy + dev-python/docutils + dev-python/quex" +RDEPEND="${DEPEND}" + +S="${WORKDIR}"/${MYPN} + +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_test() { + testsuite/testsuite.py | grep FAILED && die "Test failed" +} + +src_install() { + default + python_domodule langkit + python_doscript scripts/create-project.py +} diff --git a/dev-ada/langkit/metadata.xml b/dev-ada/langkit/metadata.xml new file mode 100644 index 000..bfb9cb6484b --- /dev/null +++ b/dev-ada/langkit/metadata.xml @@ -0,0 +1,18 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + tup...@gentoo.org + Tupone Alfredo + + + Langkit (nickname for language kit) is a tool whose