mirror of
https://git.yoctoproject.org/poky
synced 2026-05-02 18:32:15 +02:00
9556937fba
0001-Add-WITH_TESTS-option.patch 0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch removed since they're included in 0.66.0 0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch 0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch modified for new version Changelog: ========= Use rpmdbCookie from librpm, remove hawkey.Sack._rpmdb_version Fix handling transaction id in resolveTransactionItemReason (RhBug:2010259,2053014) Remove deprecated assertions (RhBug:2027383) Skip rich deps for autodetection of unmet dependencies (RhBug:2033130, 2048394) Increase required rpm version since we use rpmdbCookie() (From OE-Core rev: a5df953824474dfcb99ee3da305c11e2b178eeb5) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
31 lines
876 B
Diff
31 lines
876 B
Diff
From 18c2c06017784cd641cc8a3deee5fc472008f7f4 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] Set libsolv variables with pkg-config (cmake's own module
|
|
|
|
doesn't work properly).
|
|
|
|
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
|
|
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 fd6e3f0..5383744 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -52,7 +52,8 @@ endif()
|
|
|
|
# build dependencies
|
|
find_package(Gpgme REQUIRED)
|
|
-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext)
|
|
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
|
|
+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
|
|
|
|
|
|
# build dependencies via pkg-config
|
|
--
|
|
2.25.1
|
|
|