diff options
Diffstat (limited to 'dev-python/pygccxml')
-rw-r--r-- | dev-python/pygccxml/Manifest | 7 | ||||
-rw-r--r-- | dev-python/pygccxml/files/pygccxml-2.5.0-fix-test-flags.patch | 10 | ||||
-rw-r--r-- | dev-python/pygccxml/files/pygccxml-2.5.0-fix-tests.patch | 107 | ||||
-rw-r--r-- | dev-python/pygccxml/files/pygccxml-2.5.0-which.patch | 68 | ||||
-rw-r--r-- | dev-python/pygccxml/pygccxml-2.5.0.ebuild | 55 | ||||
-rw-r--r-- | dev-python/pygccxml/pygccxml-2.6.1.ebuild | 2 |
6 files changed, 2 insertions, 247 deletions
diff --git a/dev-python/pygccxml/Manifest b/dev-python/pygccxml/Manifest index c852debed30e..00b54df31c74 100644 --- a/dev-python/pygccxml/Manifest +++ b/dev-python/pygccxml/Manifest @@ -1,10 +1,5 @@ AUX pygccxml-2.4.0-doc.patch 798 BLAKE2B f062375f40ada000fd266f50d6fdf3ab70ef744c2dfdf29e4d80d1a2008fd910e09053f6cff0ee9b7fd0bd7b263331ca40a1349b821e2203a16a04032ada5a94 SHA512 357b35fa379f90ce56a391b54ff9b4550845747c79fd5c0f3b0a331adfbf5e157c7b9e2a0a7ea2b5929a4074e4ff02b7553d8131961c86b1993fbb627179c729 -AUX pygccxml-2.5.0-fix-test-flags.patch 331 BLAKE2B a5815a5e6908728dfc7104dc8bd7d8408098e52ca34d0fad8b3c760ca2de5d1a1803a7ff989ace7cf881dc74fee14561e4487735dc44a4ca102ac91204a8f1d3 SHA512 61f47c57e6688ad4975e803c3f20df01c64fe4d75d14e1cb7e037e5a6f9cff013180808e753681d1d934c8bdd36b81fccfc2871a655af82006c9fad4fb8fff4a -AUX pygccxml-2.5.0-fix-tests.patch 5083 BLAKE2B d1b1863cc744ee9941b2064d0e5623988ce00141663f27dde3b3ff9d0db8a9d9ef28d85aabe4f42faf071d6b3e3b3559b6732e0e25b50beaf7d03425c9c09640 SHA512 156ad1196f2b41918fb85f493533e24a4c44c52e15dda15fdb262c4e602f12bcae9331ec16c4ae8bb8b50256a872dc88e371908b94d282ff973953ccb65e9fd9 -AUX pygccxml-2.5.0-which.patch 2637 BLAKE2B 859f7418d5c427e27a925993c209ff6daff667abf0822eea8baf49a5ad5b349ccfb3083e765e6aa893019b402b7464c46ca50f7e484ded6f84c4d85c17955c4b SHA512 48d1bb31516afcefbb80dc04a47166bf9980da1aee9c5e434c7d45928cfee7abcaa0e7cc64752de78991144351c90b4c6160a42aa4d0639a791162467444c056 AUX pygccxml-2.6.1-xml_generator.patch 207 BLAKE2B f4a4081edf2adf520bd2bd9739528f6090bae3b0ca0a0e137d29c528a2fe9bfa8be854e71ade91657f043f66aa899f1ff9ad7f10ff3e3df7ea323efa101cf8ec SHA512 ac90d4d3a6123f29152c091616f5456741acaf859f0d5a360dc851a99a4dea5d315e8a80735641166259edbe2ee0dffe19b6aa986a10f93cdecee3db0ee099c0 -DIST pygccxml-2.5.0.gh.tar.gz 3163862 BLAKE2B 2a61474acab7e7a21b21bc7131a9b9aae2a318d3b761c9a3865055146331891e5fb2041a9136bd8816e60a4dc76a39a22d5f5632f22336341667eee537521a42 SHA512 499be7383ac9817c5620f7f0b2e6fdb9a6f5d934cc54a2ef9864877a2a7d896997ab5bc2e8b0c3c87df1ac7e4a384d3c8cbcc87f9496125502c97766df57b003 DIST pygccxml-2.6.1.gh.tar.gz 3154561 BLAKE2B 95fb9df63f4175eab707211cb14d178437928ddad76eeb416d8cf4a48b29c211d80ba55533deb0a12e6bad4435df9bf82a1321b37cdc8db39d217f2995d1215e SHA512 b0ccd12b50d93287189fa86be6e11f44e28869045e6d7f6f84f34220cea642fc267eee150fe544bb54839b7f467f64af4a6025c84b94df7793645f2d444ae60d -EBUILD pygccxml-2.5.0.ebuild 1223 BLAKE2B f8b167120eaae75b8c4a14b22e18cdd13b61cea4e00462cb3cc45f8116cc80cb266371ff170e477d9e9865f502b10485c765942082155f4d9ae63a0cb4c884fa SHA512 ac84e131d55b71078f09b03755cc3d88e96770be409dc6e218db25bf5cd8c230896710db4ed7728347b76df9b099d8415e502e9d0e34c41693f5fb25b417b597 -EBUILD pygccxml-2.6.1.ebuild 1683 BLAKE2B 25ac97460356661d1a953b525b6d68d58c3d6c772332bde17042318c15d20d3d83f47ac011e2533da4f6bd8f12926397ed3111df525c75185b229f8abdb8d804 SHA512 121bd7ae573d1634039d6ae4747e6a9d86c3f9d33f513529d061e8aecee468f9b0b01c294a916833615007a5d40c21494746c211b4ebdd92faf3f1d12f9c2c75 +EBUILD pygccxml-2.6.1.ebuild 1682 BLAKE2B 7ba9f54bfa2a3be624e2f6ad9bc79f8eccffbea02c83681b65fe15db2576ec2e7e6f61537490d29eda0faef2b8e50786ef6eda4d34bf58f99c1b5606afc7feb8 SHA512 c9f1fac7b35b1349e190617b278f1ef92f4bf7bc49c0b190d2b55e39fb809605a75a43619e11f0730fe7df0cdfd27273a0959b9807b7228e405e0ec0cbe05224 MISC metadata.xml 554 BLAKE2B 27017dc7cae6aacbe62f9ba64896e0a247371844b0baab86c5c1b1673771b888e2043a4486863857b565ed18a7928c500c07b6c6dc4f1f50494e680367928aca SHA512 eb46746c8d9b3341d8057a457785ad0c3b34ba26ca941496bc5c37f767c7472a2ed2bb5aafe06f5b677710f969b9a9229d8c24cd3dcdd30624168765bc89e3b7 diff --git a/dev-python/pygccxml/files/pygccxml-2.5.0-fix-test-flags.patch b/dev-python/pygccxml/files/pygccxml-2.5.0-fix-test-flags.patch deleted file mode 100644 index c96ef5e8d7ab..000000000000 --- a/dev-python/pygccxml/files/pygccxml-2.5.0-fix-test-flags.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/unittests/xml_generator.cfg b/unittests/xml_generator.cfg -index cb00818..58899b6 100644 ---- a/unittests/xml_generator.cfg -+++ b/unittests/xml_generator.cfg -@@ -15,3 +15,5 @@ include_paths= - compiler= - # Keep xml files after errors (useful for debugging) - keep_xml= -+# needed with clang-19 -+cflags=-fsized-deallocation diff --git a/dev-python/pygccxml/files/pygccxml-2.5.0-fix-tests.patch b/dev-python/pygccxml/files/pygccxml-2.5.0-fix-tests.patch deleted file mode 100644 index 5a65fd826fff..000000000000 --- a/dev-python/pygccxml/files/pygccxml-2.5.0-fix-tests.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff --git a/unittests/test_cpp_standards.py b/unittests/test_cpp_standards.py -index eb28418..7c76c73 100644 ---- a/unittests/test_cpp_standards.py -+++ b/unittests/test_cpp_standards.py -@@ -23,7 +23,8 @@ class Test(parser_test_case.parser_test_case_t): - if "gccxml" in self.config.xml_generator: - return True - -- parser.parse(["cpp_standards.hpp"], self.config) -+ parser.parse(["cpp_standards.hpp"], self.config, -+ parser.COMPILATION_MODE.ALL_AT_ONCE) - - if platform.system() != 'Windows': - self.config.cflags = "-std=c++98" -@@ -33,7 +34,8 @@ class Test(parser_test_case.parser_test_case_t): - parser.parse(["cpp_standards.hpp"], self.config) - - self.config.cflags = "-std=c++11" -- parser.parse(["cpp_standards.hpp"], self.config) -+ parser.parse(["cpp_standards.hpp"], self.config, -+ parser.COMPILATION_MODE.ALL_AT_ONCE) - - # This is broken with llvm 3.6.2 (the one from homebrew) - # It should work with never llvms but I keep the test disabled -diff --git a/unittests/test_non_copyable_recursive.py b/unittests/test_non_copyable_recursive.py -index cd78a9a..e18d58f 100644 ---- a/unittests/test_non_copyable_recursive.py -+++ b/unittests/test_non_copyable_recursive.py -@@ -27,7 +27,7 @@ class Test(parser_test_case.parser_test_case_t): - RuntimeError: maximum recursion depth exceeded while - calling a Python object - """ -- decls = parser.parse([self.header], self.config) -+ decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE) - global_ns = declarations.get_global_namespace(decls) - - # Description of the problem (before the fix): -@@ -52,7 +52,7 @@ class Test(parser_test_case.parser_test_case_t): - RuntimeError: maximum recursion depth exceeded while - calling a Python object - """ -- decls = parser.parse([self.header], self.config) -+ decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE) - global_ns = declarations.get_global_namespace(decls) - - # Real life example of the bug. This leads to a similar error, -diff --git a/unittests/test_null_comparison.py b/unittests/test_null_comparison.py -index 51caf4a..787ae79 100644 ---- a/unittests/test_null_comparison.py -+++ b/unittests/test_null_comparison.py -@@ -22,7 +22,7 @@ class Test(parser_test_case.parser_test_case_t): - Test for None comparisons with default arguments - """ - -- decls = parser.parse([self.header], self.config) -+ decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE) - global_ns = declarations.get_global_namespace(decls) - - ns = global_ns.namespace("ns") -diff --git a/unittests/test_overrides.py b/unittests/test_overrides.py -index 9204efc..5ac1b25 100644 ---- a/unittests/test_overrides.py -+++ b/unittests/test_overrides.py -@@ -23,7 +23,7 @@ class Test(parser_test_case.parser_test_case_t): - def setUp(self): - - if not self.global_ns: -- decls = parser.parse([self.header], self.config) -+ decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE) - Test.global_ns = declarations.get_global_namespace(decls) - Test.xml_generator_from_xml_file = \ - self.config.xml_generator_from_xml_file -diff --git a/unittests/test_pattern_parser.py b/unittests/test_pattern_parser.py -index 00a6805..4882c26 100644 ---- a/unittests/test_pattern_parser.py -+++ b/unittests/test_pattern_parser.py -@@ -27,7 +27,7 @@ class Test(parser_test_case.parser_test_case_t): - if self.config.xml_generator == "gccxml": - return - -- decls = parser.parse([self.header], self.config) -+ decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE) - - for decl in declarations.make_flatten(decls): - if "myClass" in decl.name: -@@ -44,7 +44,7 @@ class Test(parser_test_case.parser_test_case_t): - if self.config.xml_generator == "gccxml": - return - -- decls = parser.parse([self.header], self.config) -+ decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE) - global_ns = declarations.get_global_namespace(decls) - criteria = declarations.declaration_matcher(name="myClass") - _ = declarations.matcher.find(criteria, global_ns) -diff --git a/unittests/test_smart_pointer.py b/unittests/test_smart_pointer.py -index e9183b7..4a85860 100644 ---- a/unittests/test_smart_pointer.py -+++ b/unittests/test_smart_pointer.py -@@ -22,7 +22,7 @@ class Test(parser_test_case.parser_test_case_t): - def setUp(self): - if self.config.xml_generator == "gccxml": - return -- decls = parser.parse([self.header], self.config) -+ decls = parser.parse([self.header], self.config, parser.COMPILATION_MODE.ALL_AT_ONCE) - self.global_ns = declarations.get_global_namespace(decls) - - def test_is_smart_pointer(self): diff --git a/dev-python/pygccxml/files/pygccxml-2.5.0-which.patch b/dev-python/pygccxml/files/pygccxml-2.5.0-which.patch deleted file mode 100644 index 52ac56ed48f0..000000000000 --- a/dev-python/pygccxml/files/pygccxml-2.5.0-which.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 08f53536a0e76bab000df2837af4a13f06bbd4a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Mon, 15 Apr 2024 15:50:39 +0200 -Subject: [PATCH] Use `shutil.which()` to get compiler path - -Remove the `__get_first_compiler_in_path()` function that used -`which(1)` / `where` program to get the compiler path, with built-in -`shutil.which()`. This fixes pygccxml on systems where `which(1)` -is no longer present (it is not a standard POSIX tool, and Linux -distributions are working towards making it optional). ---- - src/pygccxml/parser/config.py | 28 +++++++--------------------- - 1 file changed, 7 insertions(+), 21 deletions(-) - -diff --git a/src/pygccxml/parser/config.py b/src/pygccxml/parser/config.py -index 1032b54e..4fe4a6a0 100644 ---- a/src/pygccxml/parser/config.py -+++ b/src/pygccxml/parser/config.py -@@ -11,6 +11,7 @@ - import os - import copy - import platform -+import shutil - import subprocess - import warnings - # In py3, ConfigParser was renamed to the more-standard configparser. -@@ -451,35 +452,20 @@ def create_compiler_path(xml_generator, compiler_path): - if xml_generator == 'castxml' and compiler_path is None: - if platform.system() == 'Windows': - # Look for msvc -- compiler_path = __get_first_compiler_in_path('where', 'cl') -+ compiler_path = shutil.which('cl') - # No msvc found; look for mingw -- if compiler_path == '': -- compiler_path = __get_first_compiler_in_path('where', 'mingw') -+ if compiler_path is None: -+ compiler_path = shutil.which('mingw') - else: - # OS X or Linux - # Look for clang first, then gcc -- compiler_path = __get_first_compiler_in_path('which', 'clang++') -+ compiler_path = shutil.which('clang++') - # No clang found; use gcc -- if compiler_path == '': -- compiler_path = __get_first_compiler_in_path('which', 'c++') -- -- if compiler_path == "": -- compiler_path = None -+ if compiler_path is None: -+ compiler_path = shutil.which('c++') - - return compiler_path - - --def __get_first_compiler_in_path(command, compiler_name): -- p = subprocess.Popen( -- [command, compiler_name], -- stdout=subprocess.PIPE, -- stderr=subprocess.PIPE) -- path = p.stdout.read().decode("utf-8").rstrip().split("\r\n")[0].rstrip() -- p.wait() -- p.stdout.close() -- p.stderr.close() -- return path -- -- - if __name__ == '__main__': - print(load_xml_generator_configuration('xml_generator.cfg').__dict__) diff --git a/dev-python/pygccxml/pygccxml-2.5.0.ebuild b/dev-python/pygccxml/pygccxml-2.5.0.ebuild deleted file mode 100644 index aceef8890670..000000000000 --- a/dev-python/pygccxml/pygccxml-2.5.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 - -DESCRIPTION="A specialized XML reader to navigate C++ declarations" -HOMEPAGE=" - https://github.com/CastXML/pygccxml/ - https://pypi.org/project/pygccxml/ -" -SRC_URI=" - https://github.com/CastXML/pygccxml/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="amd64 ~arm ~riscv ~x86" - -DEPEND=" - ${PYTHON_DEPS} - dev-libs/castxml -" -RDEPEND=" - ${DEPEND} -" - -distutils_enable_tests pytest -distutils_enable_sphinx docs dev-python/sphinx-rtd-theme - -EPYTEST_DESELECT=( - # TODO; too new LLVM? upstream tests against LLVM 13 - unittests/test_overrides.py::Test::test - # fails with >=GCC-15.0.2 (bug #940578) - unittests/test_smart_pointer.py::Test::test_smart_pointer_value_type - -) - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-2.5.0-fix-tests.patch" - "${FILESDIR}/${PN}-2.4.0-doc.patch" - # https://github.com/CastXML/pygccxml/pull/179 - "${FILESDIR}/${P}-which.patch" - # fixes tests with clang-19 - "${FILESDIR}/${PN}-2.5.0-fix-test-flags.patch" - ) - - distutils-r1_python_prepare_all -} diff --git a/dev-python/pygccxml/pygccxml-2.6.1.ebuild b/dev-python/pygccxml/pygccxml-2.6.1.ebuild index f9872baf8620..e9b0df552297 100644 --- a/dev-python/pygccxml/pygccxml-2.6.1.ebuild +++ b/dev-python/pygccxml/pygccxml-2.6.1.ebuild @@ -20,7 +20,7 @@ SRC_URI=" LICENSE="Boost-1.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~riscv ~x86" +KEYWORDS="amd64 ~arm ~riscv ~x86" DEPEND=" ${PYTHON_DEPS} |