mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

libdnf: don't depend on libcheck

Browse Source 
Apply a patch to make libcheck optional, so we don't need to depend on
it as we don't install the tests.

(From OE-Core rev: 31b95e3c242654f8a7949e8d06df20101668b5a7)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2025-09-22 15:20:28 +01:00
committed by Richard Purdie
parent 06941b559e
commit 1e6ec66607
2 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
meta/recipes-devtools/libdnf/libdnf/optional-check.patch Normal file
View File

@@ -0,0 +1,52 @@
From a4abd42a6b92f6aa16490c0f482bf08c4a6c2864 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Thu, 18 Sep 2025 11:23:33 +0100
Subject: [PATCH] Move libcheck dependency to tests/
If we're not building the tests then there's no point in depending on
libcheck, so move the pkg_check_modules() call to tests/CMakeLists.
Upstream-Status: Backport [https://github.com/rpm-software-management/libdnf/commit/6a127aec78d2ef837776e0e5a8e3636101a54ab0]
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
CMakeLists.txt | 1 -
tests/CMakeLists.txt | 7 +++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a489ea73..d1969899 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,6 @@ find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext)
# build dependencies via pkg-config
-pkg_check_modules(CHECK REQUIRED check)
pkg_check_modules(GLIB REQUIRED gio-unix-2.0>=2.46.0)
include_directories(${GLIB_INCLUDE_DIRS})
pkg_check_modules(JSONC REQUIRED json-c)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e4909682..78743f4e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,6 @@
+pkg_check_modules(CHECK REQUIRED check)
+pkg_check_modules(CPPUNIT REQUIRED cppunit)
+
add_subdirectory(libdnf/conf)
add_subdirectory(libdnf/module/modulemd)
add_subdirectory(libdnf/module)
@@ -7,10 +10,6 @@ add_subdirectory(libdnf/sack)
add_subdirectory(hawkey)
add_subdirectory(libdnf)
-
-
-pkg_check_modules(CPPUNIT REQUIRED cppunit)
-
set(LIBDNF_TEST_SOURCES
${LIBDNF_TEST_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/run_tests.cpp
--
2.43.0

4
meta/recipes-devtools/libdnf/libdnf_0.74.0.bb
View File

@@ -11,12 +11,13 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
file://enable_test_data_dir_set.patch \
file://0001-drop-FindPythonInstDir.cmake.patch \
file://armarch.patch \
file://optional-check.patch \
"
SRCREV = "91a0bf9aada36a722855051526f012e0b5ab1af9"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native util-linux"
DEPENDS = "glib-2.0 libsolv librepo rpm gtk-doc libmodulemd json-c swig-native util-linux"
inherit gtk-doc gobject-introspection cmake pkgconfig setuptools3-base
@@ -31,4 +32,3 @@ EXTRA_OECMAKE:append:class-nativesdk = " -DWITH_GIR=OFF"
BBCLASSEXTEND = "native nativesdk"
SKIP_RECIPE[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}"