diff options
Diffstat (limited to 'media-gfx/exiv2/files/exiv2-0.26-cmake2.patch')
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26-cmake2.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch b/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch deleted file mode 100644 index 76a194424866..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26-cmake2.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 3af0d1a6b2c12b7f62a293d19bdf235db75d6b07 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <bernd.kuhls@t-online.de> -Date: Sat, 3 Jun 2017 17:18:24 +0200 -Subject: [PATCH] cmake: fix gettext support - -Building exiv2 with uclibc and gettext fails currently as detected -by the buildroot autobuilders: -http://autobuild.buildroot.net/results/def/defcdd3dd57b031c31bb16c0075f079a482bf52d/build-end.log ---- - config/CMakeChecks.txt | 12 ++++++++++-- - src/CMakeLists.txt | 6 +++--- - 2 files changed, 13 insertions(+), 5 deletions(-) - -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index b3a888f2..f7621a92 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -95,8 +95,16 @@ ELSE( EXIV2_ENABLE_SHARED ) - ENDIF( EXIV2_ENABLE_SHARED ) - - IF( EXIV2_ENABLE_NLS ) -- #FIND_PACKAGE(Intl REQUIRED) -- #INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) -+ FIND_PACKAGE(Intl) -+ if(Intl_FOUND) -+ INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) -+ find_library(LIBINTL_LIBRARY NAMES intl libintl) -+ if(libintl_FOUND) -+ SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY}) -+ else(libintl_FOUND) -+ SET(LIBINTL_LIBRARIES) -+ endif() -+ endif() - IF( NOT LOCALEDIR ) - SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) - IF( WIN32 ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index aecd6215..e2904c6f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -316,13 +316,13 @@ msvc_runtime_configure(${EXIV2_ENABLE_SHARED} ${EXIV2_ENABLE_DYNAMIC_RUNTIME}) - # ****************************************************************************** - # exiv2 application - ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) --TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) -+TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) - INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) - - # ****************************************************************************** - # connection test application - ADD_EXECUTABLE( conntest ${CONNTEST} ) --TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES}) -+TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES} ${LIBINTL_LIBRARIES} ) - - # ****************************************************************************** - # exifprint application -@@ -332,7 +332,7 @@ TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH - # ****************************************************************************** - # remotetest application - ADD_EXECUTABLE( remotetest ${REMOTETEST} ) --TARGET_LINK_LIBRARIES( remotetest exiv2lib ) -+TARGET_LINK_LIBRARIES( remotetest exiv2lib ${LIBINTL_LIBRARIES} ) - - # ****************************************************************************** - # Headers |