diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-01-26 14:34:55 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-27 08:20:02 +0000 |
| commit | 05d0b9eafb855dcf6ce5c3f641b5c155e274c833 (patch) | |
| tree | d4b1c36e60dae916e83e4a334d3ef542a04bfe74 /meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch | |
| parent | 482ed7cd8035233dbe5aa6db1e606fa4b3f03948 (diff) | |
| download | poky-05d0b9eafb855dcf6ce5c3f641b5c155e274c833.tar.gz | |
rpm: update 4.18.1 -> 4.19.1
Upstream has replaced autoconf with cmake, which necessitates a rewrite of the
recipe and available options, and a rebase to cmake of
0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch
Correct a mistake in 0001-Do-not-read-config-files-from-HOME.patch :
the patch was removing the NULL marker at the end of function arguments,
and 0002-Add-support-for-prefixing-etc-from-RPM_ETCCONFIGDIR-.patch
was restoring it (in addition to the actual change the patch was making).
Now both patches preserve the NULL terminator.
(From OE-Core rev: 38549d462b399e3a63335f60a44c8bbced98639a)
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-look-for-lua-with-pkg-config-rather-t.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch new file mode 100644 index 0000000000..5053caae33 --- /dev/null +++ b/meta/recipes-devtools/rpm/files/0001-CMakeLists.txt-look-for-lua-with-pkg-config-rather-t.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From ca4655f36c3c7883eb50381902890b23f0e8aaab Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex@linutronix.de> | ||
| 3 | Date: Wed, 29 Nov 2023 14:06:15 +0100 | ||
| 4 | Subject: [PATCH] CMakeLists.txt: look for lua with pkg-config rather than | ||
| 5 | cmake modules | ||
| 6 | |||
| 7 | Otherwise cmake will try to find libm, badly, and fail. | ||
| 8 | |||
| 9 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
| 11 | |||
| 12 | --- | ||
| 13 | CMakeLists.txt | 2 +- | ||
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 15 | |||
| 16 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| 17 | index 7f0630453..d0ea565f3 100644 | ||
| 18 | --- a/CMakeLists.txt | ||
| 19 | +++ b/CMakeLists.txt | ||
| 20 | @@ -187,7 +187,7 @@ set(REQFUNCS | ||
| 21 | ) | ||
| 22 | |||
| 23 | find_package(PkgConfig REQUIRED) | ||
| 24 | -find_package(Lua 5.2 REQUIRED) | ||
| 25 | +pkg_check_modules(LUA REQUIRED IMPORTED_TARGET lua>=5.2) | ||
| 26 | find_package(ZLIB REQUIRED) | ||
| 27 | find_package(BZip2) | ||
| 28 | find_package(Iconv) | ||
