commit: 3d87a84e9efadd125720c7caf8b5045948353547
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 07:55:27 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 07:55:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d87a84e
media-gfx/exiv2: Fix !multilib_is_native_abi build
Gentoo-bug: 634178
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-gfx/exiv2/exiv2-0.26_p20171013.ebuild | 2 +
.../exiv2/files/exiv2-0.26_p20171013-cmake.patch | 47 ++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
index 92035195fe4..9aa6302ffd0 100644
--- a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
+++ b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
@@ -41,6 +41,8 @@ DEPEND="${RDEPEND}
DOCS=( README.md doc/ChangeLog doc/cmd.txt )
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
pkg_setup() {
use doc && python-any-r1_pkg_setup
}
diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
new file mode 100644
index 00000000000..c10f125415b
--- /dev/null
+++ b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch
@@ -0,0 +1,47 @@
+From 57883ee664260f5a1b382575e7477ad34c86ce7d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlech...@gmail.com>
+Date: Fri, 13 Oct 2017 18:54:11 +0200
+Subject: [PATCH] Fix build with EXIV2_BUILD_EXIV2_COMMAND=OFF
+
+---
+ src/CMakeLists.txt | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index fe49a0a6..f75cbf1b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -291,21 +291,28 @@ if(EXIV2_BUILD_EXIV2_COMMAND)
+ if ( BUILD_SHARED_LIBS )
+ target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL )
+ endif()
++ # modify source lists to suit environment
++
++ # TODO This should not be needed here! we need to fix the previous TODO
++ target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/)
++
++ if(NOT EXV_HAVE_TIMEGM )
++ target_sources(exiv2 PRIVATE localtime.c)
++ endif()
++
++ if (MSVC)
++ target_sources(exiv2 PRIVATE getopt_win32.c)
++ endif()
+ install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+
+-# TODO This should not be needed here! we need to fix the previous TODO
+-target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/)
+-
+ # modify source lists to suit environment
+ if(NOT EXV_HAVE_TIMEGM )
+ target_sources(exiv2lib PRIVATE localtime.c)
+- target_sources(exiv2 PRIVATE localtime.c)
+ endif()
+
+ if (MSVC)
+ target_sources(exiv2lib PRIVATE getopt_win32.c)
+- target_sources(exiv2 PRIVATE getopt_win32.c)
+ endif()
+
+ #
******************************************************************************
