From ecb65269b8c7bf8fa724f8f8cd4b6b9aedb80ef4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Apr 2019 21:47:41 +0200 Subject: [PATCH] package/wireshark: fix static build with libxml2 and lzma Fixes: - http://autobuild.buildroot.org/results/533c75836ba6281000b89a648fc653b9ff4685ee Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...-config-to-find-libxml2-dependencies.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/wireshark/0004-FindXml2-use-pkg-config-to-find-libxml2-dependencies.patch diff --git a/package/wireshark/0004-FindXml2-use-pkg-config-to-find-libxml2-dependencies.patch b/package/wireshark/0004-FindXml2-use-pkg-config-to-find-libxml2-dependencies.patch new file mode 100644 index 0000000000..ab549021e4 --- /dev/null +++ b/package/wireshark/0004-FindXml2-use-pkg-config-to-find-libxml2-dependencies.patch @@ -0,0 +1,33 @@ +From e6a2e71831f0699e9759e0579a00eea5fcb93696 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 24 Apr 2019 20:23:00 +0200 +Subject: [PATCH] FindXml2: use pkg-config to find libxml2 dependencies + +On UNIX, when statically built, libxml2 can depends on other libraries such +as lzma. These dependencies are already retrieved through pkg-config so +append them to LIBXML2_LIBRARIES otherwise static build will fail + +Signed-off-by: Fabrice Fontaine +[Upstream status: not sent yet] +--- + cmake/modules/FindLibXml2.cmake | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cmake/modules/FindLibXml2.cmake b/cmake/modules/FindLibXml2.cmake +index 99d70af57d..2a4b1f470f 100644 +--- a/cmake/modules/FindLibXml2.cmake ++++ b/cmake/modules/FindLibXml2.cmake +@@ -98,6 +98,10 @@ endif() + + set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR} ${PC_LIBXML_INCLUDE_DIRS}) + set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY}) ++# Include transitive dependencies for static linking. ++if(UNIX) ++ list(APPEND LIBXML2_LIBRARIES ${PC_LIBXML_LIBRARIES}) ++endif() + + include(FindPackageHandleStandardArgs) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 +-- +2.20.1 + -- 2.30.2