diff options
Diffstat (limited to 'meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch')
| -rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch index 931959b5f3..fc3b048b7d 100644 --- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch +++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch @@ -1,29 +1,30 @@ -From 6d2718b925453f9a6915001f489606eb8e4086c8 Mon Sep 17 00:00:00 2001 +From 55cbe6f40fe0836385e1a7241ec811cbe99e5840 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 30 Dec 2016 18:24:50 +0200 -Subject: [PATCH 4/4] Set libsolv variables with pkg-config (cmake's own module +Subject: [PATCH 4/5] Set libsolv variables with pkg-config (cmake's own module doesn't work properly). Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8edb627..b531da1 100644 +index a75df04..8b2ab9a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -28,7 +28,8 @@ find_package (PkgConfig REQUIRED) +@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED) SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) -find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) - pkg_check_modules (CHECK REQUIRED check) - pkg_check_modules (REPO REQUIRED librepo) - FIND_PROGRAM (VALGRIND_PROGRAM NAMES valgrind PATH /usr/bin /usr/local/bin) + if (ENABLE_RHSM_SUPPORT) + pkg_check_modules (RHSM REQUIRED librhsm) + include_directories (${RHSM_INCLUDE_DIRS}) -- 2.11.0 |