commit: 2b10ea3bbf80c3d0b7951c2e63569047ec1e45ac
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 8 20:39:25 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 8 21:10:47 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b10ea3b
media-libs/vigra: Drop last use of LIBDIR_SUFFIX
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../vigra/files/vigra-1.11.1-lib_suffix.patch | 29 ++++++++++++++++++++++
media-libs/vigra/vigra-9999.ebuild | 5 ++--
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch
b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch
new file mode 100644
index 00000000000..2b4b90df348
--- /dev/null
+++ b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch
@@ -0,0 +1,29 @@
+LIBDIR_SUFFIX is only used in one location, while LIB_SUFFIX is set already.
+
+--- a/config/vigra-config.in 2017-05-19 17:01:08.000000000 +0200
++++ b/config/vigra-config.in 2019-04-08 22:33:18.938060195 +0200
+@@ -68,7 +68,7 @@
+ if op.impex_lib: # was: --impex_lib|--impex-lib|--libs
+ ldflags = []
+
+- libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIBDIR_SUFFIX@'
++ libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@'
+ if libDir not in standardLibDirs:
+ ldflags.append('-L' + libDir)
+
+--- a/config/VigraSetDefaults.cmake 2017-05-19 17:01:08.000000000 +0200
++++ b/config/VigraSetDefaults.cmake 2019-04-08 22:33:09.361974643 +0200
+@@ -59,13 +59,6 @@
+ CACHE BOOL "Perform valgrind memory testing upon 'make ctest' ?"
+ FORCE)
+
+-IF(NOT DEFINED LIBDIR_SUFFIX)
+- SET(LIBDIR_SUFFIX "")
+-ENDIF()
+-SET(LIBDIR_SUFFIX ${LIBDIR_SUFFIX}
+- CACHE STRING "Define suffix of lib directory name (empty string or 32 or
64)."
+- FORCE)
+-
+ IF(NOT DEFINED DEPENDENCY_SEARCH_PREFIX)
+ SET(DEPENDENCY_SEARCH_PREFIX "")
+ ENDIF()
diff --git a/media-libs/vigra/vigra-9999.ebuild
b/media-libs/vigra/vigra-9999.ebuild
index 6b2aabf8904..6d2b0b088cc 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -61,6 +61,8 @@ RDEPEND="${DEPEND}"
# Severely broken, also disabled in Fedora, bugs #390447, #653442
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" )
+
pkg_setup() {
use python && python_setup
}
@@ -92,13 +94,10 @@ src_prepare() {
src_configure() {
vigra_configure() {
- local libdir="$(get_libdir)"
-
local mycmakeargs=(
-DAUTOEXEC_TESTS=OFF
-DDOCDIR="${BUILD_DIR}/doc"
-DDOCINSTALL="share/doc/${PF}"
- -DLIBDIR_SUFFIX="${libdir/lib}"
-DWITH_HDF5=$(usex hdf5 ON OFF)
-DWITH_OPENEXR=$(usex openexr ON OFF)
-DWITH_VALGRIND=$(usex valgrind ON OFF)
