diff options
author | Gyorgy Sarvari <skandigraun@gmail.com> | 2025-07-18 12:11:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-07-18 16:21:40 +0100 |
commit | 0a0721810fbae6ab9726ceb5f8850b6b80f57fe9 (patch) | |
tree | 91396637764d01577b680b5849b2bcbfa0cf5ec2 /meta | |
parent | ddc2297e709d2dacef907910a5d22f13feef71f5 (diff) | |
download | poky-master-next.tar.gz |
libgit2: upgrade 1.9.0 -> 1.9.1master-next
Dropped 0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch
because it's included in this release.
Changelog: see https://github.com/libgit2/libgit2/releases/tag/v1.9.1
(From OE-Core rev: 765e0f85840c2341b2a068c60ea148e17cef09cc)
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch | 32 | ||||
-rw-r--r-- | meta/recipes-support/libgit2/libgit2_1.9.1.bb (renamed from meta/recipes-support/libgit2/libgit2_1.9.0.bb) | 6 |
2 files changed, 2 insertions, 36 deletions
diff --git a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch b/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch deleted file mode 100644 index ae48524e0d..0000000000 --- a/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 8ca35649c33d0d2fcdcd573ce6a9edd91c77e4da Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Tue, 7 Jan 2025 18:56:19 +0100 | ||
4 | Subject: [PATCH] src/libgit2/CMakeLists.txt: install cmake files into | ||
5 | configured libdir | ||
6 | |||
7 | libdir can be something else than /usr/lib, e.g. /usr/lib64 or similar. | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/libgit2/libgit2/pull/7004] | ||
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
11 | --- | ||
12 | src/libgit2/CMakeLists.txt | 4 ++-- | ||
13 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt | ||
16 | index a7d3c7ca4..16b3a23d9 100644 | ||
17 | --- a/src/libgit2/CMakeLists.txt | ||
18 | +++ b/src/libgit2/CMakeLists.txt | ||
19 | @@ -119,11 +119,11 @@ configure_file(config.cmake.in | ||
20 | install(FILES | ||
21 | "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake" | ||
22 | "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake" | ||
23 | - DESTINATION "lib/cmake/${PROJECT_NAME}") | ||
24 | + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") | ||
25 | install( | ||
26 | EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME} | ||
27 | NAMESPACE "${PROJECT_NAME}::" | ||
28 | - DESTINATION "lib/cmake/${PROJECT_NAME}") | ||
29 | + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") | ||
30 | |||
31 | # Install | ||
32 | |||
diff --git a/meta/recipes-support/libgit2/libgit2_1.9.0.bb b/meta/recipes-support/libgit2/libgit2_1.9.1.bb index 66ec62f17a..43957a2087 100644 --- a/meta/recipes-support/libgit2/libgit2_1.9.0.bb +++ b/meta/recipes-support/libgit2/libgit2_1.9.1.bb | |||
@@ -5,10 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d" | |||
5 | 5 | ||
6 | DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" | 6 | DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https \ | 8 | SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.9;protocol=https;tag=v${PV}" |
9 | file://0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch \ | 9 | SRCREV = "0060d9cf5666f015b1067129bd874c6cc4c9c7ac" |
10 | " | ||
11 | SRCREV = "338e6fb681369ff0537719095e22ce9dc602dbf0" | ||
12 | 10 | ||
13 | inherit cmake | 11 | inherit cmake |
14 | 12 | ||