| 1 |
commit: 2b10ea3bbf80c3d0b7951c2e63569047ec1e45ac |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 8 20:39:25 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 8 21:10:47 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b10ea3b |
| 7 |
|
| 8 |
media-libs/vigra: Drop last use of LIBDIR_SUFFIX |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../vigra/files/vigra-1.11.1-lib_suffix.patch | 29 ++++++++++++++++++++++ |
| 14 |
media-libs/vigra/vigra-9999.ebuild | 5 ++-- |
| 15 |
2 files changed, 31 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..2b4b90df348 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-libs/vigra/files/vigra-1.11.1-lib_suffix.patch |
| 22 |
@@ -0,0 +1,29 @@ |
| 23 |
+LIBDIR_SUFFIX is only used in one location, while LIB_SUFFIX is set already. |
| 24 |
+ |
| 25 |
+--- a/config/vigra-config.in 2017-05-19 17:01:08.000000000 +0200 |
| 26 |
++++ b/config/vigra-config.in 2019-04-08 22:33:18.938060195 +0200 |
| 27 |
+@@ -68,7 +68,7 @@ |
| 28 |
+ if op.impex_lib: # was: --impex_lib|--impex-lib|--libs |
| 29 |
+ ldflags = [] |
| 30 |
+ |
| 31 |
+- libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIBDIR_SUFFIX@' |
| 32 |
++ libDir = '@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@' |
| 33 |
+ if libDir not in standardLibDirs: |
| 34 |
+ ldflags.append('-L' + libDir) |
| 35 |
+ |
| 36 |
+--- a/config/VigraSetDefaults.cmake 2017-05-19 17:01:08.000000000 +0200 |
| 37 |
++++ b/config/VigraSetDefaults.cmake 2019-04-08 22:33:09.361974643 +0200 |
| 38 |
+@@ -59,13 +59,6 @@ |
| 39 |
+ CACHE BOOL "Perform valgrind memory testing upon 'make ctest' ?" |
| 40 |
+ FORCE) |
| 41 |
+ |
| 42 |
+-IF(NOT DEFINED LIBDIR_SUFFIX) |
| 43 |
+- SET(LIBDIR_SUFFIX "") |
| 44 |
+-ENDIF() |
| 45 |
+-SET(LIBDIR_SUFFIX ${LIBDIR_SUFFIX} |
| 46 |
+- CACHE STRING "Define suffix of lib directory name (empty string or 32 or 64)." |
| 47 |
+- FORCE) |
| 48 |
+- |
| 49 |
+ IF(NOT DEFINED DEPENDENCY_SEARCH_PREFIX) |
| 50 |
+ SET(DEPENDENCY_SEARCH_PREFIX "") |
| 51 |
+ ENDIF() |
| 52 |
|
| 53 |
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild |
| 54 |
index 6b2aabf8904..6d2b0b088cc 100644 |
| 55 |
--- a/media-libs/vigra/vigra-9999.ebuild |
| 56 |
+++ b/media-libs/vigra/vigra-9999.ebuild |
| 57 |
@@ -61,6 +61,8 @@ RDEPEND="${DEPEND}" |
| 58 |
# Severely broken, also disabled in Fedora, bugs #390447, #653442 |
| 59 |
RESTRICT="test" |
| 60 |
|
| 61 |
+PATCHES=( "${FILESDIR}/${PN}-1.11.1-lib_suffix.patch" ) |
| 62 |
+ |
| 63 |
pkg_setup() { |
| 64 |
use python && python_setup |
| 65 |
} |
| 66 |
@@ -92,13 +94,10 @@ src_prepare() { |
| 67 |
|
| 68 |
src_configure() { |
| 69 |
vigra_configure() { |
| 70 |
- local libdir="$(get_libdir)" |
| 71 |
- |
| 72 |
local mycmakeargs=( |
| 73 |
-DAUTOEXEC_TESTS=OFF |
| 74 |
-DDOCDIR="${BUILD_DIR}/doc" |
| 75 |
-DDOCINSTALL="share/doc/${PF}" |
| 76 |
- -DLIBDIR_SUFFIX="${libdir/lib}" |
| 77 |
-DWITH_HDF5=$(usex hdf5 ON OFF) |
| 78 |
-DWITH_OPENEXR=$(usex openexr ON OFF) |
| 79 |
-DWITH_VALGRIND=$(usex valgrind ON OFF) |
Archives