NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/wireshark: fix static build with libxml2 and lzma

Browse Source 
Fixes:
 - http://autobuild.buildroot.org/results/533c75836ba6281000b89a648fc653b9ff4685ee

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Fabrice Fontaine 2019-04-24 21:47:41 +02:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent b79439af44
commit ecb65269b8
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
package/wireshark/0004-FindXml2-use-pkg-config-to-find-libxml2-dependencies.patch Normal file
View File

@ -0,0 +1,33 @@
From e6a2e71831f0699e9759e0579a00eea5fcb93696 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
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 <fontaine.fabrice@gmail.com>
[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