mirror of
https://git.yoctoproject.org/poky
synced 2026-04-04 14:02:22 +02:00
librepo: upgrade 1.9.2 -> 1.9.3
(From OE-Core rev: 135e3ea7f8d4450daae933df907aa981d425fb9d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d22139c951
commit
924cbe39df
@@ -1,4 +1,4 @@
|
||||
From 9f44d2f4aaf706027fe5a02f6d83547ff343f09c Mon Sep 17 00:00:00 2001
|
||||
From f5a1dfe4c87c228165bc25e7fe464120d8139a3d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:23:27 +0200
|
||||
Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
|
||||
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 0f7271f..d71373f 100644
|
||||
index e949dbe..c954b2e 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -30,7 +30,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
|
||||
@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
|
||||
PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl)
|
||||
PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
|
||||
FIND_PACKAGE(CURL REQUIRED)
|
||||
@@ -23,5 +23,5 @@ index 0f7271f..d71373f 100644
|
||||
+PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
|
||||
+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
|
||||
|
||||
INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
|
||||
|
||||
IF (WITH_ZCHUNK)
|
||||
|
||||
@@ -7,7 +7,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \
|
||||
file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
|
||||
"
|
||||
|
||||
SRCREV = "313a7644d03f9657ee0c7aa747d1db260f8e2fc0"
|
||||
SRCREV = "f1212bd4a55467ab8578c87f98ed363cccd5907a"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
@@ -15,7 +15,7 @@ DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2"
|
||||
|
||||
inherit cmake distutils3-base pkgconfig
|
||||
|
||||
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DENABLE_TESTS=OFF -DENABLE_DOCS=OFF"
|
||||
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DENABLE_TESTS=OFF -DENABLE_DOCS=OFF -DWITH_ZCHUNK=OFF"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
Reference in New Issue
Block a user