From ba0f1ed8329f945c8d7718ac06a374d8b390828b Mon Sep 17 00:00:00 2001 From: David Seifert Date: Mon, 24 Jan 2022 10:32:15 +0100 Subject: sci-mathematics/minisat: don't install static libraries (pg0204) Signed-off-by: David Seifert --- .../minisat/files/minisat-2.2.1-cmake.patch | 54 ++++++++++++++++++++++ sci-mathematics/minisat/minisat-2.2.1-r1.ebuild | 27 +++++++++++ sci-mathematics/minisat/minisat-2.2.1.ebuild | 29 ------------ 3 files changed, 81 insertions(+), 29 deletions(-) create mode 100644 sci-mathematics/minisat/files/minisat-2.2.1-cmake.patch create mode 100644 sci-mathematics/minisat/minisat-2.2.1-r1.ebuild delete mode 100644 sci-mathematics/minisat/minisat-2.2.1.ebuild (limited to 'sci-mathematics/minisat') diff --git a/sci-mathematics/minisat/files/minisat-2.2.1-cmake.patch b/sci-mathematics/minisat/files/minisat-2.2.1-cmake.patch new file mode 100644 index 000000000000..1c875827f6ac --- /dev/null +++ b/sci-mathematics/minisat/files/minisat-2.2.1-cmake.patch @@ -0,0 +1,54 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,7 @@ + + project(minisat) + ++include(GNUInstallDirs) + #-------------------------------------------------------------------------------------------------- + # Configurable options: + +@@ -44,24 +45,16 @@ + minisat/core/Solver.cc + minisat/simp/SimpSolver.cc) + +-add_library(minisat-lib-static STATIC ${MINISAT_LIB_SOURCES}) + add_library(minisat-lib-shared SHARED ${MINISAT_LIB_SOURCES}) + + target_link_libraries(minisat-lib-shared ${ZLIB_LIBRARY}) +-target_link_libraries(minisat-lib-static ${ZLIB_LIBRARY}) + + add_executable(minisat_core minisat/core/Main.cc) + add_executable(minisat_simp minisat/simp/Main.cc) + +-if(STATIC_BINARIES) +- target_link_libraries(minisat_core minisat-lib-static) +- target_link_libraries(minisat_simp minisat-lib-static) +-else() +- target_link_libraries(minisat_core minisat-lib-shared) +- target_link_libraries(minisat_simp minisat-lib-shared) +-endif() ++target_link_libraries(minisat_core minisat-lib-shared) ++target_link_libraries(minisat_simp minisat-lib-shared) + +-set_target_properties(minisat-lib-static PROPERTIES OUTPUT_NAME "minisat") + set_target_properties(minisat-lib-shared + PROPERTIES + OUTPUT_NAME "minisat" +@@ -73,11 +66,11 @@ + #-------------------------------------------------------------------------------------------------- + # Installation targets: + +-install(TARGETS minisat-lib-static minisat-lib-shared minisat_core minisat_simp +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) ++install(TARGETS minisat-lib-shared minisat_core minisat_simp ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + + install(DIRECTORY minisat/mtl minisat/utils minisat/core minisat/simp +- DESTINATION include/minisat ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/minisat + FILES_MATCHING PATTERN "*.h") diff --git a/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild b/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild new file mode 100644 index 000000000000..15d260429e0f --- /dev/null +++ b/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Small yet efficient SAT solver with reference paper" +HOMEPAGE="http://minisat.se/Main.html" +SRC_URI="https://github.com/stp/${PN}/archive/releases/${PV}.tar.gz -> ${P}.tar.gz + doc? ( http://minisat.se/downloads/MiniSat.pdf )" +S="${WORKDIR}/${PN}-releases-${PV}" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +RDEPEND="sys-libs/zlib:=" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) + +src_install() { + cmake_src_install + use doc && dodoc "${DISTDIR}"/MiniSat.pdf +} diff --git a/sci-mathematics/minisat/minisat-2.2.1.ebuild b/sci-mathematics/minisat/minisat-2.2.1.ebuild deleted file mode 100644 index 360c5a33082b..000000000000 --- a/sci-mathematics/minisat/minisat-2.2.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="Small yet efficient SAT solver with reference paper" -HOMEPAGE="http://minisat.se/Main.html" -SRC_URI="https://github.com/stp/${PN}/archive/releases/${PV}.tar.gz -> ${P}.tar.gz - doc? ( http://minisat.se/downloads/MiniSat.pdf )" -S="${WORKDIR}/${PN}-releases-${PV}" - -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -LICENSE="MIT" -IUSE="doc" - -RDEPEND="sys-libs/zlib:=" -DEPEND="${RDEPEND}" - -src_install() { - cmake_src_install - - mv "${D}"/usr/lib "${D}"/usr/$(get_libdir) || die - dosym libminisat.a /usr/$(get_libdir)/libMiniSat.a - - use doc && dodoc "${DISTDIR}"/MiniSat.pdf -} -- cgit v1.2.3-65-gdbad