Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / cryptominisat
Commits: f8e0e60b by Antonio Rojas at 2024-08-31T10:13:05+02:00 Link static dependencies privately Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/cryptominisat/-/issues/1 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + link-private.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = cryptominisat pkgdesc = A modern, multi-threaded, feature-rich, simplifying SAT solver pkgver = 5.11.22 - pkgrel = 1 + pkgrel = 2 url = https://github.com/msoos/cryptominisat/ arch = x86_64 license = MIT @@ -23,9 +23,11 @@ pkgbase = cryptominisat source = git+https://github.com/meelgroup/cadiback#commit=ea65a9442fc2604ee5f4ffd0f0fdd0bf481d5b42 source = git+https://github.com/meelgroup/cadical.git#commit=c90592eab35a4a26ad901367db3cd727c5ab79c5 source = python-system-libs.patch + source = link-private.patch sha256sums = 0e6fc417cfbe03f1b993cdaf5ba8c22e98585f58321df24ad87a28fc3854bb2f sha256sums = e7e96d6e91bba3c9d28c798545f25236f107aec97780ee0c459352606c7c3a0c sha256sums = 1769c624bb55a26de5a027f17bfaa323fac8d338db8069eeb76934aa3c0625d4 sha256sums = d5f0d3c314a36283dbea3022c45d1c21b0857b6e5ccddec61985b15391f611bb + sha256sums = a5006f49e8adf1474725d2a3e4205cdd65beb2f100f5538b2f89e14de0613e0f pkgname = cryptominisat ===================================== PKGBUILD ===================================== @@ -3,7 +3,7 @@ pkgname=cryptominisat pkgver=5.11.22 -pkgrel=1 +pkgrel=2 _cadiback=ea65a9442fc2604ee5f4ffd0f0fdd0bf481d5b42 _cadical=c90592eab35a4a26ad901367db3cd727c5ab79c5 pkgdesc='A modern, multi-threaded, feature-rich, simplifying SAT solver' @@ -27,11 +27,13 @@ optdepends=('python: python module') source=(git+https://github.com/msoos/cryptominisat#tag=$pkgver git+https://github.com/meelgroup/cadiback#commit=$_cadiback git+https://github.com/meelgroup/cadical.git#commit=$_cadical - python-system-libs.patch) + python-system-libs.patch + link-private.patch) sha256sums=('0e6fc417cfbe03f1b993cdaf5ba8c22e98585f58321df24ad87a28fc3854bb2f' 'e7e96d6e91bba3c9d28c798545f25236f107aec97780ee0c459352606c7c3a0c' '1769c624bb55a26de5a027f17bfaa323fac8d338db8069eeb76934aa3c0625d4' - 'd5f0d3c314a36283dbea3022c45d1c21b0857b6e5ccddec61985b15391f611bb') + 'd5f0d3c314a36283dbea3022c45d1c21b0857b6e5ccddec61985b15391f611bb' + 'a5006f49e8adf1474725d2a3e4205cdd65beb2f100f5538b2f89e14de0613e0f') prepare() { cd $pkgname @@ -41,6 +43,7 @@ prepare() { patch -p1 -i ../python-system-libs.patch # Build python module against shared library sed -e '/makeSuite(TestDump)/d' -i python/tests/test_pycryptosat.py # Remove broken tests sed -e 's|/$COMPILE/|/${COMPILE//\\//\\\\/}/|' -i ../cadiback/configure # Honor system build flags + patch -p1 -i ../link-private.patch # Link cadiback and cadical privately } build() { ===================================== link-private.patch ===================================== @@ -0,0 +1,15 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 93fa43e2d..55ae164ae 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -273,8 +273,8 @@ target_link_libraries(cryptominisat5 + LINK_PUBLIC ${LOUVAIN_COMMUNITIES_LIBRARIES} + LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} + LINK_PUBLIC ${GMP_LIBRARIES} +- LINK_PUBLIC ${cadiback} +- LINK_PUBLIC ${cadical} ++ LINK_PRIVATE ${cadiback} ++ LINK_PRIVATE ${cadical} + ) + + if (NOT WIN32) View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/cryptominisat/-/commit/f8e0e60b7d4fd9aa185a1a1a55dcd2b7ea123d58 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/cryptominisat/-/commit/f8e0e60b7d4fd9aa185a1a1a55dcd2b7ea123d58 You're receiving this email because of your account on gitlab.archlinux.org.
