diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2017-06-03 18:30:11 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-03 19:00:39 +0200 |
| commit | 5f8c38d2e92620c6ca6028b20ff39d8ba9e719bd (patch) | |
| tree | 912bada25961db4afe94d31e0aae8bdcd1ab0a1b /package/exiv2 | |
| parent | 5d4733003d29f7a4144b3e4f7a43bb7d3732775e (diff) | |
| download | buildroot-5f8c38d2e92620c6ca6028b20ff39d8ba9e719bd.tar.gz buildroot-5f8c38d2e92620c6ca6028b20ff39d8ba9e719bd.zip | |
package/exiv2: fix gettext support
Fixes:
http://autobuild.buildroot.net/results/defcdd3dd57b031c31bb16c0075f079a482bf52d
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/exiv2')
| -rw-r--r-- | package/exiv2/0001-cmake-fix-gettext-support.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/package/exiv2/0001-cmake-fix-gettext-support.patch b/package/exiv2/0001-cmake-fix-gettext-support.patch new file mode 100644 index 0000000000..435e08ac66 --- /dev/null +++ b/package/exiv2/0001-cmake-fix-gettext-support.patch @@ -0,0 +1,72 @@ +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 + +Patch sent upstream: https://github.com/Exiv2/exiv2/pull/6 + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + 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 +-- +2.11.0 + |
