File libdnf-0.24.1-with-static-libsolvext.patch of Package libdnf

Overview Repositories Revisions Requests Users Attributes Meta

File libdnf-0.24.1-with-static-libsolvext.patch of Package libdnf (Revision 5e7ddec158451f79d6aa695bd3e6c0cc)

Currently displaying revision 5e7ddec158451f79d6aa695bd3e6c0cc , Show latest

From a24c0c00d7c78c386492cfafeb3968a9f9e6ebfa Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Tue, 5 Feb 2019 08:45:33 -0500
Subject: [PATCH] Ensure libsolvext dynamic library dependencies are linked

libsolv, when built only build with static link libraries, does not
make a fully usable configuration for static libsolvext to be used
because the CMake and pkgconfig files do not declare the appropriate
libraries to successfully link a static libsolvext that has dynamic library
dependencies.

This patch works around it by doing the declarations here rather than
in libsolv, since it's not easy to fix there, given upstream constraints.
---
 CMakeLists.txt               | 13 +++++++++++++
 cmake/modules/FindLZMA.cmake | 25 +++++++++++++++++++++++++
 libdnf/CMakeLists.txt        |  8 +++++++-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 cmake/modules/FindLZMA.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f92a1c..d2aa64c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,6 +67,19 @@ FIND_PACKAGE (OpenSSL REQUIRED)
 
 FIND_PROGRAM (VALGRIND_PROGRAM NAMES valgrind PATH /usr/bin /usr/local/bin)
 
+# Ensure that static libsolvext dynamic library dependencies are linked in
+# libxml2 dependency
+find_package (LibXml2 REQUIRED)
+# zlib dependency
+find_package (ZLIB REQUIRED)
+# lzma dependency
+find_package (LZMA REQUIRED)
+# bzip2 dependency
+find_package (BZip2 REQUIRED)
+# zstd dependency
+FIND_LIBRARY (ZSTD_LIBRARY NAMES zstd)
+# End static libsolvext dynamic library dependencies
+
 IF (ENABLE_SOLV_URPMREORDER)
    ADD_DEFINITIONS(-DLIBSOLV_FLAG_URPMREORDER=1)
 ENDIF()
diff --git a/cmake/modules/FindLZMA.cmake b/cmake/modules/FindLZMA.cmake
new file mode 100644
index 0000000..eb112df
--- /dev/null
+++ b/cmake/modules/FindLZMA.cmake
@@ -0,0 +1,25 @@
+# - Find lzma
+# Find the native LZMA headers and library
+#
+#  LZMA_INCLUDE_DIR    - where to find lzma.h, etc.
+#  LZMA_LIBRARIES      - List of libraries when using liblzma.
+#  LZMA_FOUND          - True if liblzma found.
+
+IF (LZMA_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(LZMA_FIND_QUIETLY TRUE)
+ENDIF (LZMA_INCLUDE_DIR)
+
+FIND_PATH(LZMA_INCLUDE_DIR lzma.h)
+FIND_LIBRARY(LZMA_LIBRARY NAMES lzma liblzma)
+
+# handle the QUIETLY and REQUIRED arguments and set LZMA_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LZMA DEFAULT_MSG LZMA_LIBRARY LZMA_INCLUDE_DIR)
+
+IF(LZMA_FOUND)
+  SET( LZMA_LIBRARIES ${LZMA_LIBRARY} )
+ELSE(LZMA_FOUND)
+  SET( LZMA_LIBRARIES )
+ENDIF(LZMA_FOUND)
diff --git a/libdnf/CMakeLists.txt b/libdnf/CMakeLists.txt
index 7bf1cfd..d51eea7 100644
--- a/libdnf/CMakeLists.txt
+++ b/libdnf/CMakeLists.txt
@@ -71,7 +71,13 @@ TARGET_LINK_LIBRARIES(libdnf
                       ${JSONC_LIBRARIES}
                       ${LIBMODULEMD_LIBRARIES}
                       ${SMARTCOLS_LIBRARIES}
-                      ${GPGME_VANILLA_LIBRARIES})
+                      ${GPGME_VANILLA_LIBRARIES}
+                      ${LIBXML2_LIBRARIES}
+                      ${ZLIB_LIBRARY}
+                      ${LZMA_LIBRARY}
+                      ${BZIP2_LIBRARY}
+                      ${ZSTD_LIBRARY}
+                      )
 
 if (ENABLE_RHSM_SUPPORT)
     target_link_libraries (libdnf ${RHSM_LIBRARIES})
-- 
2.20.1

Places

File libdnf-0.24.1-with-static-libsolvext.patch of Package libdnf (Revision 5e7ddec158451f79d6aa695bd3e6c0cc)

Places