summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
diff options
context:
space:
mode:
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.patch17
1 files changed, 7 insertions, 10 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 6cf48a49f3..80b1ed7bf1 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,7 +1,7 @@
1From bcea5c5063a2d5f07dbe6f40aee30370fc4ba656 Mon Sep 17 00:00:00 2001 1From 2bcd0b9f6310bacdc554e077e85319a5e90e5ce0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:24:50 +0200 3Date: Fri, 30 Dec 2016 18:24:50 +0200
4Subject: [PATCH 1/2] Set libsolv variables with pkg-config (cmake's own module 4Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module
5 5
6 doesn't work properly). 6 doesn't work properly).
7 7
@@ -13,19 +13,16 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 2 insertions(+), 1 deletion(-) 13 1 file changed, 2 insertions(+), 1 deletion(-)
14 14
15diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 8875bbf..ca280f3 100644 16index 0b405cb..cd91f08 100644
17--- a/CMakeLists.txt 17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
19@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED) 19@@ -46,7 +46,8 @@ endif(APPLE)
20 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
21 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED) 20 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
21 pkg_check_modules(SMARTCOLS REQUIRED smartcols)
22 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) 22 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
23-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext) 23-find_package (LibSolv 0.6.30 REQUIRED COMPONENTS ext)
24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
25+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) 25+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
26 if (ENABLE_RHSM_SUPPORT) 26 if (ENABLE_RHSM_SUPPORT)
27 pkg_check_modules (RHSM REQUIRED librhsm) 27 pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3)
28 include_directories (${RHSM_INCLUDE_DIRS}) 28 include_directories (${RHSM_INCLUDE_DIRS})
29--
302.14.2
31