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.patch11
1 files changed, 6 insertions, 5 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 1ea9310893..6cf48a49f3 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,8 @@
1From 55cbe6f40fe0836385e1a7241ec811cbe99e5840 Mon Sep 17 00:00:00 2001 1From bcea5c5063a2d5f07dbe6f40aee30370fc4ba656 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 4/5] Set libsolv variables with pkg-config (cmake's own module 4Subject: [PATCH 1/2] Set libsolv variables with pkg-config (cmake's own module
5
5 doesn't work properly). 6 doesn't work properly).
6 7
7Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] 8Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
@@ -12,12 +13,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 1 file changed, 2 insertions(+), 1 deletion(-) 13 1 file changed, 2 insertions(+), 1 deletion(-)
13 14
14diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
15index a75df04..8b2ab9a 100644 16index 8875bbf..ca280f3 100644
16--- a/CMakeLists.txt 17--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
18@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED) 19@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED)
19 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) 20 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
20 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) 21 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
21 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) 22 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
22-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext) 23-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext)
23+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
@@ -26,5 +27,5 @@ index a75df04..8b2ab9a 100644
26 pkg_check_modules (RHSM REQUIRED librhsm) 27 pkg_check_modules (RHSM REQUIRED librhsm)
27 include_directories (${RHSM_INCLUDE_DIRS}) 28 include_directories (${RHSM_INCLUDE_DIRS})
28-- 29--
292.11.0 302.14.2
30 31