[gentoo-commits] repo/gentoo:master commit in: sci-libs/symengine/files/, sci-libs/symengine/
commit: e675ae12003e17698880d20cd159c7d515f54a4c
Author: Michał Górny gentoo org>
AuthorDate: Fri Dec 22 16:22:21 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Dec 22 16:43:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e675ae12
sci-libs/symengine: Remove old
Signed-off-by: Michał Górny gentoo.org>
sci-libs/symengine/Manifest| 2 -
.../files/symengine-0.9.0-pthread-cmake.patch | 63 -
sci-libs/symengine/symengine-0.10.1.ebuild | 103 -
sci-libs/symengine/symengine-0.9.0-r3.ebuild | 99
4 files changed, 267 deletions(-)
diff --git a/sci-libs/symengine/Manifest b/sci-libs/symengine/Manifest
index cf6f7942c9bd..b5add05ebc62 100644
--- a/sci-libs/symengine/Manifest
+++ b/sci-libs/symengine/Manifest
@@ -1,3 +1 @@
-DIST symengine-0.10.1.tar.gz 898206 BLAKE2B
88182a7facaf0d9ac90de8acaf549a3fd3cb65f0ae12e0ba3d9a1ae477d193b312cebfca99e626815789d8746822f0d1e256db6836a1ce265f65951880f486f3
SHA512
e73f62a87d20b676cac66ce82ac93308b688ed2ac18ebdb6884bae1ae66868e1033e33908e797f86a1906f91b975e8607a02e8932db8550a677f6b41373b7934
DIST symengine-0.11.1.tar.gz 898181 BLAKE2B
ef14e09ceb7e9783711ca7f9f06a59362c40222e7f85de5545be834ecd79bbf41fcd34141bb3a63c106ee45067dd0b957377f937097183ffd5b93c6943976571
SHA512
076aac35428589c5b3524a46bd939a3a3a7da44b1c866b5f71487678b27b6e48b4da034029f1630881d7713a9252e905411a04b8016c9ec56a608b6de23365ac
-DIST symengine-0.9.0.tar.gz 878574 BLAKE2B
32c37ca6575b3f7e37184c80c2df74ebf7bb7846537e951be6c888994b8dc049c1ed2a6f51da1c1cfb038e0a47393b18acff60cfef665c5a5e714beb9b0ecb12
SHA512
dceca49ddb6e2ac7c4f8ecb73ce19824cbaa3eff41ad0f50008e403498121184b4e9dc660628dbd8e4db979f8c16b83a709a40540f7834954ab01f9854e12caa
diff --git a/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch
b/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch
deleted file mode 100644
index 0fa049dbf218..
--- a/sci-libs/symengine/files/symengine-0.9.0-pthread-cmake.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 6ad9620ffc578abdb920b84ea5e393c726389ac0 Mon Sep 17 00:00:00 2001
-From: Sam James
-Date: Wed, 8 Jun 2022 06:02:25 +0100
-Subject: [PATCH] cmake: fix pthread detection
-
-The homebrew FindPTHREAD.cmake module was hardcoding the path to libpthread
-in the installed CMake config file which broke consumers when upgrading from
-< glibc-2.34 (e.g. glibc-2.33 -> glibc-2.34).
-
-CMake provides FindThreads which does the job fine for us. Tested with both
-glibc-2.33 (with a previously bad generated file, and then fixed) and
glibc-2.35.
-
-This should be fine on musl and friends too. This brings symengine in line
-with most CMake packages.
-
-Bug: https://bugs.gentoo.org/849803
-Fixes: https://github.com/symengine/symengine/issues/1910
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -335,11 +335,10 @@ if (WITH_PIRANHA)
- endif()
-
- if (WITH_PTHREAD)
--find_package(PTHREAD REQUIRED)
--include_directories(SYSTEM ${PTHREAD_INCLUDE_DIRS})
--set(LIBS ${LIBS} ${PTHREAD_TARGETS})
-+find_package(Threads)
-+set(THREADS_PREFER_PTHREAD_FLAG ON)
-+set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
- set(HAVE_SYMENGINE_PTHREAD yes)
--set(PKGS ${PKGS} "PTHREAD")
- endif()
-
- if (WITH_MPFR)
-@@ -761,10 +760,6 @@ if (WITH_BOOST)
- endif()
-
- message("WITH_PTHREAD: ${WITH_PTHREAD}")
--if (WITH_PTHREAD)
--message("PTHREAD_INCLUDE_DIRS: ${PTHREAD_INCLUDE_DIRS}")
--message("PTHREAD_LIBRARIES: ${PTHREAD_LIBRARIES}")
--endif()
-
- message("WITH_MPC: ${WITH_MPC}")
- if (WITH_MPC)
a/cmake/FindPTHREAD.cmake
-+++ /dev/null
-@@ -1,14 +0,0 @@
--include(LibFindMacros)
--
--libfind_include(pthread.h pthread)
--libfind_library(pthread pthread)
--
--set(PTHREAD_LIBRARIES ${PTHREAD_LIBRARY})
--set(PTHREAD_INCLUDE_DIRS ${PTHREAD_INCLUDE_DIR})
--set(PTHREAD_TARGETS pthread)
--
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(PTHREAD DEFAULT_MSG PTHREAD_LIBRARIES
--PTHREAD_INCLUDE_DIRS)
--
--mark_as_advanced(PTHREAD_INCLUDE_DIR PTHEARD_LIBRARY)
-
diff --git a/sci-libs/symengine/symengine-0.10.1.ebuild
b/sci-libs/symengine/symengine-0.10.1.ebuild
deleted file mode 100644
index eb06f3cc27bf..
--- a/sci-libs/symengine/symengine-0.10.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=16
-inherit cmake llvm toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/symengine/symengine;
-SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-# BUILD_FOR_DISTRIBUTION enables threads by default so do it here
-IUSE="arb benchmarks boost debug doc ecm +flint llvm
[gentoo-commits] repo/gentoo:master commit in: sci-libs/symengine/files/
commit: 6a053f9e8f0c69635bb1540498939e142ef2763c
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Jun 13 18:46:44 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Tue Jun 21 10:20:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a053f9e
sci-libs/symengine: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/25878
Signed-off-by: Andrew Ammerlaan gentoo.org>
.../symengine/files/symengine-0.7.0-boost-1.77.patch | 19 ---
1 file changed, 19 deletions(-)
diff --git a/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch
b/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch
deleted file mode 100644
index c4d6dc28e8f8..
--- a/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/symengine/symengine/commit/ceae675dccd593f119f3010d46e133de74fc01bc
-https://bugs.gentoo.org/808057
-
-From: Liam Keegan
-Date: Mon, 31 May 2021 21:31:02 +0200
-Subject: [PATCH] use list initialization for int parameter since type depends
- on boost version
-
a/symengine/mp_boost.cpp
-+++ b/symengine/mp_boost.cpp
-@@ -279,7 +279,7 @@ unsigned long mp_scan1(const integer_class )
- if (i == 0) {
- return ULONG_MAX;
- }
--return find_lsb(i, int_<0>());
-+return find_lsb(i, {});
- }
-
- // define simple 2x2 matrix with exponentiation by repeated squaring
[gentoo-commits] repo/gentoo:master commit in: sci-libs/symengine/files/, sci-libs/symengine/
commit: 56e069d09f091b00433c8f47680789b7aa297522
Author: Matthias Maier gentoo org>
AuthorDate: Sat Jun 11 07:12:50 2022 +
Commit: Matthias Maier gentoo org>
CommitDate: Sat Jun 11 07:12:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e069d0
sci-libs/symengine: als fix user configuration for USE=llvm
Signed-off-by: Matthias Maier gentoo.org>
.../symengine/files/symengine-0.8.1-fix_llvm.patch | 15
...e-0.8.1-r1.ebuild => symengine-0.8.1-r2.ebuild} | 0
...e-0.9.0-r1.ebuild => symengine-0.9.0-r2.ebuild} | 2 +-
sci-libs/symengine/symengine-0.9.0.ebuild | 99 --
4 files changed, 16 insertions(+), 100 deletions(-)
diff --git a/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
b/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
index 3e39a9eda500..810e2ac766d7 100644
--- a/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
+++ b/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
@@ -48,6 +48,21 @@ index cf5ab3b..dfa6605 100644
include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
set(HAVE_SYMENGINE_LLVM yes)
set(PKGS ${PKGS} "LLVM")
+diff --git a/cmake/SymEngineConfig.cmake.in b/cmake/SymEngineConfig.cmake.in
+index b01ef9b..6d82c10 100644
+--- a/cmake/SymEngineConfig.cmake.in
b/cmake/SymEngineConfig.cmake.in
+@@ -67,9 +67,7 @@ set(SYMENGINE_LLVM_COMPONENTS @SYMENGINE_LLVM_COMPONENTS@)
+
+ if (NOT "${SYMENGINE_LLVM_COMPONENTS}" STREQUAL "")
+ find_package(LLVM REQUIRED ${SYMENGINE_LLVM_COMPONENTS} HINTS @LLVM_DIR@)
+-llvm_map_components_to_libnames(llvm_libs_direct
${SYMENGINE_LLVM_COMPONENTS})
+-llvm_expand_dependencies(llvm_libs ${llvm_libs_direct})
+-set(SYMENGINE_LIBRARIES ${SYMENGINE_LIBRARIES} ${llvm_libs})
++set(SYMENGINE_LIBRARIES ${SYMENGINE_LIBRARIES} LLVM)
+ else()
+ set(SYMENGINE_LLVM_INCLUDE_DIRS)
+ endif()
--
2.35.1
diff --git a/sci-libs/symengine/symengine-0.8.1-r1.ebuild
b/sci-libs/symengine/symengine-0.8.1-r2.ebuild
similarity index 100%
rename from sci-libs/symengine/symengine-0.8.1-r1.ebuild
rename to sci-libs/symengine/symengine-0.8.1-r2.ebuild
diff --git a/sci-libs/symengine/symengine-0.9.0-r1.ebuild
b/sci-libs/symengine/symengine-0.9.0-r2.ebuild
similarity index 97%
rename from sci-libs/symengine/symengine-0.9.0-r1.ebuild
rename to sci-libs/symengine/symengine-0.9.0-r2.ebuild
index ea34c5e94099..52ecab72e67c 100644
--- a/sci-libs/symengine/symengine-0.9.0-r1.ebuild
+++ b/sci-libs/symengine/symengine-0.9.0-r2.ebuild
@@ -12,7 +12,7 @@
SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
# BUILD_FOR_DISTRIBUTION enables threads by default so do it here
IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test
tcmalloc +threads"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/symengine/symengine-0.9.0.ebuild
b/sci-libs/symengine/symengine-0.9.0.ebuild
deleted file mode 100644
index ea34c5e94099..
--- a/sci-libs/symengine/symengine-0.9.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=13
-inherit cmake llvm toolchain-funcs
-
-DESCRIPTION="Fast symbolic manipulation library, written in C++"
-HOMEPAGE="https://github.com/symengine/symengine;
-SRC_URI="https://github.com/symengine/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-# BUILD_FOR_DISTRIBUTION enables threads by default so do it here
-IUSE="arb benchmarks boost debug doc ecm +flint llvm +mpc +mpfr openmp test
tcmalloc +threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/gmp:=
- sys-libs/binutils-libs:=
- arb? ( sci-mathematics/arb:= )
- boost? ( dev-libs/boost:= )
- ecm? ( sci-mathematics/gmp-ecm )
- flint? ( sci-mathematics/flint:= )
- mpc? ( dev-libs/mpc:= )
- llvm? (
[gentoo-commits] repo/gentoo:master commit in: sci-libs/symengine/files/, sci-libs/symengine/, profiles/base/
commit: 973db0dbc3113bf9df5f60722573e213abb76f27
Author: Matthias Maier gentoo org>
AuthorDate: Sat Jun 11 06:48:53 2022 +
Commit: Matthias Maier gentoo org>
CommitDate: Sat Jun 11 06:50:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=973db0db
sci-libs/symengine: fix USE=llvm
Closes: https://bugs.gentoo.org/745915
Signed-off-by: Matthias Maier gentoo.org>
profiles/base/package.use.mask | 5 --
.../symengine/files/symengine-0.8.1-fix_llvm.patch | 53 ++
sci-libs/symengine/symengine-0.8.1-r1.ebuild | 1 +
3 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 53bc3cce3a18..ed524909df2a 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -55,11 +55,6 @@ net-libs/ngtcp2 openssl
# Needs masked version of ogre (>=1.12), bug #825330
>=dev-games/mygui-3.4.1 ogre
-# Sam James (2022-02-21)
-# Needs build system love to make LLVM support work.
-# bug #745915
-sci-libs/symengine llvm
-
# Marek Szuba (2022-02-07)
# Deprecated back-end with known stability and data-corruption issues,
# likely to be removed in gramps-5.2.0.
diff --git a/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
b/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
new file mode 100644
index ..3e39a9eda500
--- /dev/null
+++ b/sci-libs/symengine/files/symengine-0.8.1-fix_llvm.patch
@@ -0,0 +1,53 @@
+From: Matthias Maier
+Date: Sat, 11 Jun 2022 01:44:54 -0500
+Subject: [PATCH] Fix cmake configure for shared LLVM libraries
+
+Gentoo builds LLVM into a combined shared library. The CMake
+configuration shipped with LLVM is evidently broken in this case, see
+
+ https://github.com/llvm/llvm-project/issues/34593
+ https://bugs.gentoo.org/745915
+
+We work around this issue by simply linking against the monolithic
+"LLVM" target.
+---
+ CMakeLists.txt | 23 +--
+ 1 file changed, 1 insertion(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cf5ab3b..dfa6605 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -402,28 +402,7 @@ if (WITH_LLVM)
+ endforeach()
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
+
+-llvm_map_components_to_libnames(llvm_libs_direct
${SYMENGINE_LLVM_COMPONENTS})
+-llvm_expand_dependencies(llvm_libs ${llvm_libs_direct})
+-
+-if (BUILD_SHARED_LIBS)
+-set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT False)
+-foreach(LLVM_LIB ${llvm_libs})
+-get_target_property(${LLVM_LIB}_IMPORT_LOCATION ${LLVM_LIB}
LOCATION)
+-if (NOT "${${LLVM_LIB}_IMPORT_LOCATION}" MATCHES "NOTFOUND")
+-if (NOT "${${LLVM_LIB}_IMPORT_LOCATION}" MATCHES ".a$|.lib$")
+-set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT True)
+-endif()
+-endif()
+-endforeach()
+-else()
+-set(SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT True)
+-endif()
+-set(SYMENGINE_LLVM_LINK_DOWNSTREAM
${SYMENGINE_LLVM_LINK_DOWNSTREAM_DEFAULT}
+-CACHE INTERNAL "Link to llvm in SymEngineConfig.cmake")
+-if (NOT SYMENGINE_LLVM_LINK_DOWNSTREAM)
+-unset(SYMENGINE_LLVM_COMPONENTS)
+-endif ()
+-set(LIBS ${LIBS} ${llvm_libs})
++set(LIBS ${LIBS} LLVM)
+ include_directories(SYSTEM ${LLVM_INCLUDE_DIRS})
+ set(HAVE_SYMENGINE_LLVM yes)
+ set(PKGS ${PKGS} "LLVM")
+--
+2.35.1
+
diff --git a/sci-libs/symengine/symengine-0.8.1-r1.ebuild
b/sci-libs/symengine/symengine-0.8.1-r1.ebuild
index c389bae57034..6aee3b49af90 100644
--- a/sci-libs/symengine/symengine-0.8.1-r1.ebuild
+++ b/sci-libs/symengine/symengine-0.8.1-r1.ebuild
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
+ "${FILESDIR}/${PN}-0.8.1-fix_llvm.patch"
)
pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/symengine/files/, sci-libs/symengine/
commit: e25d5c441605f0c72e54150644cc4dabbb65a340
Author: Sam James gentoo org>
AuthorDate: Tue Aug 17 15:44:13 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 17 15:44:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25d5c44
sci-libs/symengine: fix build with Boost 1.77
Closes: https://bugs.gentoo.org/808057
Signed-off-by: Sam James gentoo.org>
.../symengine/files/symengine-0.7.0-boost-1.77.patch | 19 +++
sci-libs/symengine/symengine-0.7.0.ebuild | 1 +
2 files changed, 20 insertions(+)
diff --git a/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch
b/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch
new file mode 100644
index 000..c4d6dc28e8f
--- /dev/null
+++ b/sci-libs/symengine/files/symengine-0.7.0-boost-1.77.patch
@@ -0,0 +1,19 @@
+https://github.com/symengine/symengine/commit/ceae675dccd593f119f3010d46e133de74fc01bc
+https://bugs.gentoo.org/808057
+
+From: Liam Keegan
+Date: Mon, 31 May 2021 21:31:02 +0200
+Subject: [PATCH] use list initialization for int parameter since type depends
+ on boost version
+
+--- a/symengine/mp_boost.cpp
b/symengine/mp_boost.cpp
+@@ -279,7 +279,7 @@ unsigned long mp_scan1(const integer_class )
+ if (i == 0) {
+ return ULONG_MAX;
+ }
+-return find_lsb(i, int_<0>());
++return find_lsb(i, {});
+ }
+
+ // define simple 2x2 matrix with exponentiation by repeated squaring
diff --git a/sci-libs/symengine/symengine-0.7.0.ebuild
b/sci-libs/symengine/symengine-0.7.0.ebuild
index b06a7e49f07..91f658820bd 100644
--- a/sci-libs/symengine/symengine-0.7.0.ebuild
+++ b/sci-libs/symengine/symengine-0.7.0.ebuild
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-0.7.0-cmake-build-type.patch"
+ "${FILESDIR}/${PN}-0.7.0-boost-1.77.patch"
)
pkg_pretend() {
