gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

media-gfx/exiv2: Fix !multilib_is_native_abi build

Browse Source 
Gentoo-bug: 634178
Package-Manager: Portage-2.3.11, Repoman-2.3.3
This commit is contained in:
Andreas Sturmlechner 2017-10-14 09:55:27 +02:00
parent ebe231de79
commit 3d87a84e9e
No known key found for this signature in database
GPG Key ID: E7255695D8BA079E
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media-gfx/exiv2/exiv2-0.26_p20171013.ebuild
View File

@ -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
}

47
media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch Normal file
View File

@ -0,0 +1,47 @@
From 57883ee664260f5a1b382575e7477ad34c86ce7d Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@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()
# ******************************************************************************