From 8dd17625671faf6a47abf31d4c96a1e20d764ba5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Feb 2023 02:17:30 +0000 Subject: gentoo auto-resync : 20:02:2023 - 02:17:29 --- sci-mathematics/stp/Manifest | 7 ++++--- .../files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch | 21 +++++++++++++++++++++ sci-mathematics/stp/files/stp-2.3.3-cstdint.patch | 11 +++++++++++ .../stp/files/stp-2.3.3-stp.py-library_path.patch | 15 +++++++++++++++ .../stp/files/stp-CMakeLists.txt-fix_cflags.patch | 21 --------------------- .../stp/files/stp-stp.py-library_path.patch | 15 --------------- sci-mathematics/stp/stp-2.3.3-r2.ebuild | 7 +++++-- 7 files changed, 56 insertions(+), 41 deletions(-) create mode 100644 sci-mathematics/stp/files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch create mode 100644 sci-mathematics/stp/files/stp-2.3.3-cstdint.patch create mode 100644 sci-mathematics/stp/files/stp-2.3.3-stp.py-library_path.patch delete mode 100644 sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch delete mode 100644 sci-mathematics/stp/files/stp-stp.py-library_path.patch (limited to 'sci-mathematics/stp') diff --git a/sci-mathematics/stp/Manifest b/sci-mathematics/stp/Manifest index 35e3b5be9bf4..8a7376955e37 100644 --- a/sci-mathematics/stp/Manifest +++ b/sci-mathematics/stp/Manifest @@ -1,7 +1,8 @@ -AUX stp-CMakeLists.txt-fix_cflags.patch 721 BLAKE2B 31f116d43270558ee88b3cde1cb6303ee35a0078ca7c1be805260a405d5932068609918d711e3c6f3ec0e01e468c0647e1b2b392311e9408a7959736c86cf720 SHA512 1b5f2e9592f178ba31797da152e960c2a78ecf37dae2737f122f6becf16b0235e515129119b176fb5439e77597ab3d5c5f910bb764e13740922bc395a3fab17b -AUX stp-stp.py-library_path.patch 372 BLAKE2B 1e36f48d2c403cdea156157826a1b3c3e424dc864bf87b30c66d13deadacc25479aaca2c44f89773c20c7ec48b49ce0c65e642e46a8ea22bd5c4695fe15ae86f SHA512 d5feaf02395d90fdba997aebbf582d764e9c238cce4300caba4316b60a1164cc3ce11e8756dd341dc6e3bc53a153fedac4c322776ca5d5b951eaf3a997456973 +AUX stp-2.3.3-CMakeLists.txt-fix_cflags.patch 721 BLAKE2B 31f116d43270558ee88b3cde1cb6303ee35a0078ca7c1be805260a405d5932068609918d711e3c6f3ec0e01e468c0647e1b2b392311e9408a7959736c86cf720 SHA512 1b5f2e9592f178ba31797da152e960c2a78ecf37dae2737f122f6becf16b0235e515129119b176fb5439e77597ab3d5c5f910bb764e13740922bc395a3fab17b +AUX stp-2.3.3-cstdint.patch 275 BLAKE2B 9343de9e9e4eeed85b2d8e61ccd1ab04fc8b0b7af29a2e54fb047e61ee9552cf06043d1fd80b4685ac6095615b8c5a5b5991c31cf207daebe442cbfd44352320 SHA512 91cdf2814b13bf73450aff6adaf0daf9a38ba0712046b808555da9817ac64a346f4e3fcb33b0c1c78ad49a2b5fe964c04966e154b269a1f323e59772b91ca6fb +AUX stp-2.3.3-stp.py-library_path.patch 372 BLAKE2B 1e36f48d2c403cdea156157826a1b3c3e424dc864bf87b30c66d13deadacc25479aaca2c44f89773c20c7ec48b49ce0c65e642e46a8ea22bd5c4695fe15ae86f SHA512 d5feaf02395d90fdba997aebbf582d764e9c238cce4300caba4316b60a1164cc3ce11e8756dd341dc6e3bc53a153fedac4c322776ca5d5b951eaf3a997456973 DIST stp-2.3.3.tar.gz 2577550 BLAKE2B 9ebedf3cb8e6b50d037cfacbc14826bd4e6505d29a53b1fcc6580749f0637fe5f96619c166babdb3a52b18fb6337e49c02f5693e233effe84d0131d0e7402381 SHA512 a0b1bf419d8230e40ce0aee90d9c8c9d814aca300831c24b3576c75623362942abf20673c419f9f0ea1e0505bfae000dc65fdd818179f5759879b0b255f1b99a DIST stp-2.3.3_OutputCheck.tar.gz 12002 BLAKE2B f8fafba8f7957f3d0ee480b9e1e8c8923c373cf134512d6329adf84a96f3177ad07d00eae4dc6dd8d4b09ca82dfc8b425602f1926e3f88ccb2556b4b7121e5b9 SHA512 36012ae2b2aee1ff3f36ba1678a4bcbfeb590e01c2042ca35eb2f49b6a890b767c1809d1415e7b03f2118204361f834ad9caf70319b59fd14b2c140bf858d16e DIST stp-2.3.3_gtest.tar.gz 469100 BLAKE2B 386444657d3f23e54f01dac8e0ac36da4d97c3eebcc8cf79bfc754c474a5ed64765a0ad389fef358667e468469c47d02a407e13e6882d426a4defb0102e4a758 SHA512 2fc79fe9c8a4e0487e7e76db9508fd2207df0cfe3940a51aeac32e4440afab9e265bfe553b1cd66086cd5a574d8bf99dbb9e1d9c4a70fafd7b31f38825914aa1 -EBUILD stp-2.3.3-r2.ebuild 2553 BLAKE2B c4af4ee61783705519a7a53be728ebd333b7437135e91dbd7cc1ea89cbda135e74db6ac2962ba4c3db6cfadb86aa37b7f5d6934953e7ef914a70fadc7cc4984c SHA512 a51b4b72c31af26cea2671a1a86a2b09af10e832dcea99fffe95ef55976542b2ce6e9adbec0f7d8fb0f2c0f5f18f35ac522b3ee90f538a03fcd22255bbe2c718 +EBUILD stp-2.3.3-r2.ebuild 2609 BLAKE2B 03a1d24e349a00040b6a8b7e14f2c9ced088efdd5b44c08df09f94465b23af2d4d1576365003c29c3d6182ca9030e653a8c351d3d638feeb0de7dcfd031d2e4e SHA512 9f75a34cbe4f12494ca7fce165411a148dd652be3169ab1c7e7d2a375a2c52fd2296493de44c941277d1b218a2e67905285531ff9cd42a4679d44a1bfe517619 MISC metadata.xml 1110 BLAKE2B e13b9420b7f730e6b9e2571e3f4e8a48cf7f54b16fa767fce48099549071c4c819e16a5da25b6779c77a5a7a7f21c3ec61eeb2719867f874a1c4fa21b84e32f2 SHA512 aa3ddfd8d3bf4647f230f0ca55b6f70f9f82f2ae63fe21edad637397fb1bd2779241a2e439a48bed59bd1de11ef3b4e275731c6a90873ec5d86bb5897bf2a9f0 diff --git a/sci-mathematics/stp/files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch b/sci-mathematics/stp/files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch new file mode 100644 index 000000000000..93817e209376 --- /dev/null +++ b/sci-mathematics/stp/files/stp-2.3.3-CMakeLists.txt-fix_cflags.patch @@ -0,0 +1,21 @@ +index f6224a6..8c7c45e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -203,17 +203,9 @@ if (NOT MSVC) + add_compile_options( -g) + add_compile_options( -pthread ) + +- add_compile_options("$<$:-O2>") +- +- add_compile_options("$<$:-O2>") + add_compile_options("$<$:-g0>") + + add_compile_options("$<$:-O0>") +- +- if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") +- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -O2") +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2") +- endif() + else() + # see https://msdn.microsoft.com/en-us/library/fwkeyyhe.aspx for details + # /ZI = include debug info diff --git a/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch b/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch new file mode 100644 index 000000000000..4c010848ee36 --- /dev/null +++ b/sci-mathematics/stp/files/stp-2.3.3-cstdint.patch @@ -0,0 +1,11 @@ +--- a/./include/stp/AST/ASTNode.h ++++ b/./include/stp/AST/ASTNode.h +@@ -24,6 +24,8 @@ THE SOFTWARE. + #ifndef ASTNODE_H + #define ASTNODE_H + ++#include ++ + #include "stp/AST/NodeFactory/HashingNodeFactory.h" + #include "stp/Util/Attributes.h" + #include "ASTInternal.h" diff --git a/sci-mathematics/stp/files/stp-2.3.3-stp.py-library_path.patch b/sci-mathematics/stp/files/stp-2.3.3-stp.py-library_path.patch new file mode 100644 index 000000000000..60b54aa2c1da --- /dev/null +++ b/sci-mathematics/stp/files/stp-2.3.3-stp.py-library_path.patch @@ -0,0 +1,15 @@ +index 61aef6d..16633e8 100644 +--- a/bindings/python/stp/stp.py.in ++++ b/bindings/python/stp/stp.py.in +@@ -42,7 +42,10 @@ Py3 = sys.version_info >= (3, 0, 0) + if Py3: + long = int + +-from library_path import PATHS ++try: ++ from .library_path import PATHS ++except ImportError: ++ from library_path import PATHS + + for path in PATHS: + if not os.path.exists(path): diff --git a/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch b/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch deleted file mode 100644 index 93817e209376..000000000000 --- a/sci-mathematics/stp/files/stp-CMakeLists.txt-fix_cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -index f6224a6..8c7c45e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -203,17 +203,9 @@ if (NOT MSVC) - add_compile_options( -g) - add_compile_options( -pthread ) - -- add_compile_options("$<$:-O2>") -- -- add_compile_options("$<$:-O2>") - add_compile_options("$<$:-g0>") - - add_compile_options("$<$:-O0>") -- -- if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") -- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -O2") -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2") -- endif() - else() - # see https://msdn.microsoft.com/en-us/library/fwkeyyhe.aspx for details - # /ZI = include debug info diff --git a/sci-mathematics/stp/files/stp-stp.py-library_path.patch b/sci-mathematics/stp/files/stp-stp.py-library_path.patch deleted file mode 100644 index 60b54aa2c1da..000000000000 --- a/sci-mathematics/stp/files/stp-stp.py-library_path.patch +++ /dev/null @@ -1,15 +0,0 @@ -index 61aef6d..16633e8 100644 ---- a/bindings/python/stp/stp.py.in -+++ b/bindings/python/stp/stp.py.in -@@ -42,7 +42,10 @@ Py3 = sys.version_info >= (3, 0, 0) - if Py3: - long = int - --from library_path import PATHS -+try: -+ from .library_path import PATHS -+except ImportError: -+ from library_path import PATHS - - for path in PATHS: - if not os.path.exists(path): diff --git a/sci-mathematics/stp/stp-2.3.3-r2.ebuild b/sci-mathematics/stp/stp-2.3.3-r2.ebuild index 8c6578dface1..000e5bef36f9 100644 --- a/sci-mathematics/stp/stp-2.3.3-r2.ebuild +++ b/sci-mathematics/stp/stp-2.3.3-r2.ebuild @@ -41,10 +41,13 @@ DEPEND="${RDEPEND}" BDEPEND="test? ( dev-python/lit )" PATCHES=( - "${FILESDIR}"/stp-CMakeLists.txt-fix_cflags.patch - "${FILESDIR}"/stp-stp.py-library_path.patch + "${FILESDIR}"/${P}-CMakeLists.txt-fix_cflags.patch + "${FILESDIR}"/${P}-cstdint.patch + "${FILESDIR}"/${P}-stp.py-library_path.patch ) +#include + pkg_setup() { use python && python-single-r1_pkg_setup } -- cgit v1.2.3