diff options
author | Samuel Martin <s.martin49@gmail.com> | 2014-12-30 10:36:27 +0100 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2014-12-30 11:19:12 +0100 |
commit | 4fc5f4a644029d2d15e2fb7907f8ad6ae45ed249 (patch) | |
tree | 1ee5c30d480de4f69a6331a85ce7ac9c1775e847 | |
parent | dc9022e48107ef5d28cdcfbbfb234fc28255bccd (diff) | |
download | buildroot-4fc5f4a644029d2d15e2fb7907f8ad6ae45ed249.tar.gz buildroot-4fc5f4a644029d2d15e2fb7907f8ad6ae45ed249.zip |
package/libiio: fix static build
Use the CMake module provided by libxml2 instead of the one from CMake to
correctly set the cflags and ldflags.
Fixes:
http://autobuild.buildroot.net/results/964f98fafdcd7e994ea25cf0993915d81537c31c/
Note that this patch needs the following one to be merged in libxml2:
https://mail.gnome.org/archives/xml/2014-December/msg00015.html
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r-- | package/libiio/0002-cmake-libxml2-detection-try-first-the-CMake-module-f.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/package/libiio/0002-cmake-libxml2-detection-try-first-the-CMake-module-f.patch b/package/libiio/0002-cmake-libxml2-detection-try-first-the-CMake-module-f.patch new file mode 100644 index 0000000000..9f441698f8 --- /dev/null +++ b/package/libiio/0002-cmake-libxml2-detection-try-first-the-CMake-module-f.patch @@ -0,0 +1,42 @@ +From 4f849e1d2287206cfb7ff0fdeca96c22383b0d53 Mon Sep 17 00:00:00 2001 +From: Samuel Martin <s.martin49@gmail.com> +Date: Mon, 29 Dec 2014 19:05:13 +0100 +Subject: [PATCH] cmake: libxml2 detection: try first the CMake module from + libxml2 + +Libxml2 >=2.9.2 provides its own CMake module, so check for it before +falling back on the CMake's module FindLibXml2.cmake. + +Signed-off-by: Samuel Martin <s.martin49@gmail.com> +--- + CMakeLists.txt | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 393fee3..b4f1d26 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -38,7 +38,19 @@ endif() + find_library(AVAHI_CLIENT_LIBRARIES avahi-client) + find_library(AVAHI_COMMON_LIBRARIES avahi-common) + find_library(PTHREAD_LIBRARIES pthread) +-include(FindLibXml2) ++ ++# Since libxml2-2.9.2, libxml2 provides its own LibXml2-config.cmake, with all ++# variables correctly set. ++# So, try first to find the CMake module provided by libxml2 package, then fallback ++# on the CMake's FindLibXml2.cmake module (which can lack some definition, especially ++# in static build case). ++find_package(LibXml2 QUIET NO_MODULE) ++if(DEFINED LIBXML2_VERSION_STRING) ++ set(LIBXML2_FOUND ON) ++ set(LIBXML2_INCLUDE_DIR ${LIBXML2_INCLUDE_DIRS}) ++else() ++ include(FindLibXml2) ++endif() + + set(LIBIIO_CFILES channel.c device.c context.c buffer.c utilities.c) + set(LIBIIO_HEADERS iio.h) +-- +2.2.1 + |