diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-12-18 17:30:05 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-03 12:35:54 +0000 |
commit | 924cbe39df6ef180e4ff32f2602cb822ec6e5ebe (patch) | |
tree | bfacf8d0792f7507010c4a9350620c672263b54d /meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch | |
parent | d22139c951f4e9d2cada4ae9b0c61c3188bc8d68 (diff) | |
download | poky-924cbe39df6ef180e4ff32f2602cb822ec6e5ebe.tar.gz |
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>
Diffstat (limited to 'meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch')
-rw-r--r-- | meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch index 488657154a..73902e5f58 100644 --- a/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch +++ b/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9f44d2f4aaf706027fe5a02f6d83547ff343f09c Mon Sep 17 00:00:00 2001 | 1 | From f5a1dfe4c87c228165bc25e7fe464120d8139a3d Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 30 Dec 2016 18:23:27 +0200 | 3 | Date: Fri, 30 Dec 2016 18:23:27 +0200 |
4 | Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module | 4 | 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> | |||
12 | 1 file changed, 2 insertions(+), 1 deletion(-) | 12 | 1 file changed, 2 insertions(+), 1 deletion(-) |
13 | 13 | ||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 14 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
15 | index 0f7271f..d71373f 100644 | 15 | index e949dbe..c954b2e 100644 |
16 | --- a/CMakeLists.txt | 16 | --- a/CMakeLists.txt |
17 | +++ b/CMakeLists.txt | 17 | +++ b/CMakeLists.txt |
18 | @@ -30,7 +30,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) | 18 | @@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) |
19 | PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) | 19 | PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) |
20 | PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) | 20 | PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) |
21 | FIND_PACKAGE(CURL REQUIRED) | 21 | FIND_PACKAGE(CURL REQUIRED) |
@@ -23,5 +23,5 @@ index 0f7271f..d71373f 100644 | |||
23 | +PKG_CHECK_MODULES(GPGME gpgme REQUIRED) | 23 | +PKG_CHECK_MODULES(GPGME gpgme REQUIRED) |
24 | +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) | 24 | +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) |
25 | 25 | ||
26 | INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS}) | ||
27 | 26 | ||
27 | IF (WITH_ZCHUNK) | ||