diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2017-06-04 10:43:17 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-05 11:52:03 +0200 |
| commit | 89b02b444f1bc9899584d9ccc9ee207bba8452f4 (patch) | |
| tree | 6528661addd68b40913f5bf72e213b7ad384e19a /package/exiv2/0002-cmake-always-depend-on-threads-not-only-in-the-xmp-c.patch | |
| parent | 04f08a43dd14250fa61837c75ccb0adb54fa5a7c (diff) | |
| download | buildroot-89b02b444f1bc9899584d9ccc9ee207bba8452f4.tar.gz buildroot-89b02b444f1bc9899584d9ccc9ee207bba8452f4.zip | |
package/exiv2: fix gettext detection, part II
It seems getting the gettext stuff right on all platforms is not that
easy, this patch bumps exiv2 to include all gettext (and pthreads)
patches applied upstream.
To reproduce the problem gettext has to be built before exiv2 so we
make gettext an optional dependency when NLS support is used.
Fixes
http://autobuild.buildroot.net/results/a56/a56c8a8a4c76b7c359ca7f5252be93fd70c6a4c1/
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/0002-cmake-always-depend-on-threads-not-only-in-the-xmp-c.patch')
| -rw-r--r-- | package/exiv2/0002-cmake-always-depend-on-threads-not-only-in-the-xmp-c.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/package/exiv2/0002-cmake-always-depend-on-threads-not-only-in-the-xmp-c.patch b/package/exiv2/0002-cmake-always-depend-on-threads-not-only-in-the-xmp-c.patch deleted file mode 100644 index 96b966f949..0000000000 --- a/package/exiv2/0002-cmake-always-depend-on-threads-not-only-in-the-xmp-c.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7acb235c05089e82b16634383ac2b33721258ba1 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <bernd.kuhls@t-online.de> -Date: Sat, 3 Jun 2017 18:25:05 +0200 -Subject: [PATCH] cmake: always depend on threads, not only in the xmp case - -Patch sent upstream: https://github.com/Exiv2/exiv2/pull/7 - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> ---- - CMakeLists.txt | 1 - - config/CMakeChecks.txt | 2 ++ - src/CMakeLists.txt | 2 ++ - 3 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7034bb67..64604c6f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,7 +120,6 @@ IF( EXIV2_ENABLE_XMP ) - IF (NOT MINGW) - set(THREADS_PREFER_PTHREAD_FLAG ON) - ENDIF() -- find_package(Threads REQUIRED) - ENDIF( EXIV2_ENABLE_XMP ) - - INCLUDE( config/CMakeChecks.txt ) -diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt -index b3a888f2..e0557642 100644 ---- a/config/CMakeChecks.txt -+++ b/config/CMakeChecks.txt -@@ -51,6 +51,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_C - LINK_DIRECTORIES( ${CMAKE_LIBRARY_PATH} ) - SET( CMAKE_REQUIRED_INCLUDES ${CMAKE_INCLUDE_PATH} ) - -+find_package(Threads REQUIRED) -+ - IF( EXIV2_ENABLE_PNG ) - FIND_PACKAGE( ZLIB REQUIRED ) - INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} ) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index aecd6215..15d521c5 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -268,10 +268,12 @@ else() - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CMAKE_THREAD_LIBS_INIT} ) - else() - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} ) - TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} ) -+ TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_THREAD_LIBS_INIT} ) - endif() - endif() - --- -2.11.0 - |
