summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch')
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
index 954add6e73..77b20c2734 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
@@ -1,28 +1,29 @@
1From 5958b151a4dbb89114e90c971a34b74f873b7beb Mon Sep 17 00:00:00 2001 1From 3012a93745223751cc979e3770207a09a075bec6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 7 Feb 2017 12:16:03 +0200 3Date: Tue, 7 Feb 2017 12:16:03 +0200
4Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is 4Subject: [PATCH 5/5] Get parameters for both libsolv and libsolvext (libdnf is
5 using both) 5 using both)
6 6
7Upstream-Status: Pending [depends on whether https://github.com/openSUSE/libsolv/pull/177 is accepted] 7Upstream-Status: Pending [depends on whether https://github.com/openSUSE/libsolv/pull/177 is accepted]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
9--- 10---
10 CMakeLists.txt | 2 +- 11 CMakeLists.txt | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
12 13
13diff --git a/CMakeLists.txt b/CMakeLists.txt 14diff --git a/CMakeLists.txt b/CMakeLists.txt
14index b531da1..e512da0 100644 15index 8b2ab9a..e2d33d7 100644
15--- a/CMakeLists.txt 16--- a/CMakeLists.txt
16+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
17@@ -28,7 +28,7 @@ find_package (PkgConfig REQUIRED) 18@@ -29,7 +29,7 @@ find_package (PkgConfig REQUIRED)
18 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) 19 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
19 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) 20 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED)
20 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) 21 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
21-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 22-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
22+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) 23+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext)
23 set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) 24 set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
24 pkg_check_modules (CHECK REQUIRED check) 25 if (ENABLE_RHSM_SUPPORT)
25 pkg_check_modules (REPO REQUIRED librepo) 26 pkg_check_modules (RHSM REQUIRED librhsm)
26-- 27--
272.11.0 282.11.0
28 29