From 5d16b99ad74fe4acadfb1752b975e6eebacf9d1c Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 8 Jan 2025 09:42:18 +0100 Subject: [PATCH] libgit2: update 1.8.4 -> 1.9.0 Make the cmake files reproducible and rather than hardcode-installed into /usr/lib. [RP: Tweak commit message] Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...eLists.txt-install-cmake-files-into-.patch | 32 +++++++++++++++++++ .../{libgit2_1.8.4.bb => libgit2_1.9.0.bb} | 10 ++++-- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch rename meta/recipes-support/libgit2/{libgit2_1.8.4.bb => libgit2_1.9.0.bb} (60%) 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 new file mode 100644 index 00000000000..ae48524e0d4 --- /dev/null +++ b/meta/recipes-support/libgit2/libgit2/0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch @@ -0,0 +1,32 @@ +From 8ca35649c33d0d2fcdcd573ce6a9edd91c77e4da Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 7 Jan 2025 18:56:19 +0100 +Subject: [PATCH] src/libgit2/CMakeLists.txt: install cmake files into + configured libdir + +libdir can be something else than /usr/lib, e.g. /usr/lib64 or similar. + +Upstream-Status: Submitted [https://github.com/libgit2/libgit2/pull/7004] +Signed-off-by: Alexander Kanavin +--- + src/libgit2/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/libgit2/CMakeLists.txt b/src/libgit2/CMakeLists.txt +index a7d3c7ca4..16b3a23d9 100644 +--- a/src/libgit2/CMakeLists.txt ++++ b/src/libgit2/CMakeLists.txt +@@ -119,11 +119,11 @@ configure_file(config.cmake.in + install(FILES + "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake" + "${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake" +- DESTINATION "lib/cmake/${PROJECT_NAME}") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + install( + EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME} + NAMESPACE "${PROJECT_NAME}::" +- DESTINATION "lib/cmake/${PROJECT_NAME}") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + + # Install + diff --git a/meta/recipes-support/libgit2/libgit2_1.8.4.bb b/meta/recipes-support/libgit2/libgit2_1.9.0.bb similarity index 60% rename from meta/recipes-support/libgit2/libgit2_1.8.4.bb rename to meta/recipes-support/libgit2/libgit2_1.9.0.bb index 63986fcd130..47a63ca2862 100644 --- a/meta/recipes-support/libgit2/libgit2_1.8.4.bb +++ b/meta/recipes-support/libgit2/libgit2_1.9.0.bb @@ -5,8 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8eacfdc17c8f4d219e131a073973b97d" DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2" -SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.8;protocol=https" -SRCREV = "3f4182d15eab74a302718f2de454ffadb1995626" +SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https \ + file://0001-src-libgit2-CMakeLists.txt-install-cmake-files-into-.patch \ + " +SRCREV = "338e6fb681369ff0537719095e22ce9dc602dbf0" S = "${WORKDIR}/git" @@ -19,3 +21,7 @@ EXTRA_OECMAKE = "\ " BBCLASSEXTEND = "native" + +do_install:append() { + sed -i -e 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/cmake/libgit2/libgit2Targets.cmake +} -- 2.47.2