summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2024-03-13 18:33:30 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-04-16 08:07:01 +0100
commit3a7ead55a40bb66b18abb9fd39c012a73f584c20 (patch)
tree488b27fe348d11c799458e86f0ea79121e9b5c06 /meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch
parent19ecd2d93529e47923b0f1329ff5a5e54ed22097 (diff)
downloadpoky-3a7ead55a40bb66b18abb9fd39c012a73f584c20.tar.gz
rpm: update 4.19.1 -> 4.19.1.1
Drop patches: files/0002-docs-CMakeLists.txt-do-not-install-non-existent-docs.patch (upstream resolved the issue) files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch files/0001-Fix-unconditional-dependency-on-non-POSIX-GLOB_ONLYD.patch (backports) (From OE-Core rev: d233e33a5ca12f95878c3ee9e34d9d9c61e49f68) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch')
-rw-r--r--meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch
deleted file mode 100644
index db83b176b4..0000000000
--- a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-restore-readline-support-as-an-explic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 3c2e529c6cc1bae4bc94cbed7358c6e0cdd2de02 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Tue, 16 Jan 2024 13:43:36 +0100
4Subject: [PATCH] CMakeLists.txt: restore readline support as an explicit
5 option
6
7This was lost in autotools -> cmake transition. The particular
8reason to make it explicit is that readline is gpl version 3
9licensed, and in some builds components under that license
10need to be excluded.
11
12Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/2852]
13Signed-off-by: Alexander Kanavin <alex@linutronix.de>
14---
15 CMakeLists.txt | 7 ++++++-
16 1 file changed, 6 insertions(+), 1 deletion(-)
17
18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index 0a474106e..89e27417f 100644
20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt
22@@ -31,6 +31,7 @@ option(WITH_AUDIT "Build with audit support" ON)
23 option(WITH_FSVERITY "Build with fsverity support" OFF)
24 option(WITH_IMAEVM "Build with IMA support" OFF)
25 option(WITH_FAPOLICYD "Build with fapolicyd support" ON)
26+option(WITH_READLINE "Build with readline support" ON)
27
28 set(RPM_CONFIGDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/rpm" CACHE PATH "rpm home")
29 set(RPM_VENDOR "vendor" CACHE STRING "rpm vendor string")
30@@ -193,7 +194,11 @@ find_package(BZip2)
31 find_package(Iconv)
32
33 pkg_check_modules(POPT REQUIRED IMPORTED_TARGET popt)
34-pkg_check_modules(READLINE IMPORTED_TARGET readline)
35+
36+if (WITH_READLINE)
37+ pkg_check_modules(READLINE REQUIRED IMPORTED_TARGET readline)
38+endif()
39+
40 pkg_check_modules(ZSTD IMPORTED_TARGET libzstd>=1.3.8)
41 pkg_check_modules(LIBELF IMPORTED_TARGET libelf)
42 pkg_check_modules(LIBDW IMPORTED_TARGET libdw)