mirror of
https://git.yoctoproject.org/poky
synced 2026-09-08 12:49:32 +02:00
5d33880b9d
Summary of changes from RPM 4.19.1 Fixes Packaging: Don’t warn about missing user/group on skipped files [Regression] (#2814) Packaging: Make user/group lookup caching thread-safe [Regression] (#2843) Lua interface: Fix regression in Lua scriptlet runaway child detection [Regression] (#2818) Build: CMakeLists.txt: restore readline support as an explicit option [Regression] (#2852) Build: Fix unconditional uses of Linux-specific extensions [Regression] (#2812) Build: Add missing include for check_symbol_exists (#2831) Build: Don’t use _nl_msg_cat_cntr if it’s not available (#2856) 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: d05416b6d6ec197b42f20652ed53ada1eb697d67) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d233e33a5ca12f95878c3ee9e34d9d9c61e49f68) Signed-off-by: Steve Sakoman <steve@sakoman.com>
28 lines
834 B
Diff
28 lines
834 B
Diff
From c39a074ff3c4d21c100d387661c7d725b5eae7b0 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Kanavin <alex@linutronix.de>
|
|
Date: Wed, 29 Nov 2023 14:06:15 +0100
|
|
Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than
|
|
cmake modules
|
|
|
|
Otherwise cmake will try to find libm, badly, and fail.
|
|
|
|
Upstream-Status: Inappropriate [oe-core specific]
|
|
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
|
|
---
|
|
CMakeLists.txt | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 4a383ceba..ed847c09a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -190,7 +190,7 @@ set(REQFUNCS
|
|
)
|
|
|
|
find_package(PkgConfig REQUIRED)
|
|
-find_package(Lua 5.2 REQUIRED)
|
|
+pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2)
|
|
find_package(ZLIB REQUIRED)
|
|
find_package(BZip2)
|
|
find_package(Iconv)
|