commit: ba0f1ed8329f945c8d7718ac06a374d8b390828b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 24 09:32:15 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 09:32:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba0f1ed8
sci-mathematics/minisat: don't install static libraries (pg0204)
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../minisat/files/minisat-2.2.1-cmake.patch | 54 ++++++++++++++++++++++
...inisat-2.2.1.ebuild => minisat-2.2.1-r1.ebuild} | 10 ++--
2 files changed, 58 insertions(+), 6 deletions(-)
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.ebuild
b/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild
similarity index 79%
rename from sci-mathematics/minisat/minisat-2.2.1.ebuild
rename to sci-mathematics/minisat/minisat-2.2.1-r1.ebuild
index 360c5a33082b..15d260429e0f 100644
--- a/sci-mathematics/minisat/minisat-2.2.1.ebuild
+++ b/sci-mathematics/minisat/minisat-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,19 +11,17 @@
SRC_URI="https://github.com/stp/${PN}/archive/releases/${PV}.tar.gz -> ${P}.tar.
doc? ( http://minisat.se/downloads/MiniSat.pdf )"
S="${WORKDIR}/${PN}-releases-${PV}"
+LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-LICENSE="MIT"
IUSE="doc"
RDEPEND="sys-libs/zlib:="
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
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
}
