summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/librepo/librepo/0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch
diff options
context:
space:
mode:
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.patch18
1 files changed, 8 insertions, 10 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 f7d7ab3a2a..488657154a 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,29 +1,27 @@
1From a36be8192615e2a1fb5a5856d44565277f15583b Mon Sep 17 00:00:00 2001 1From 9f44d2f4aaf706027fe5a02f6d83547ff343f09c Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:23:27 +0200 3Date: Fri, 30 Dec 2016 18:23:27 +0200
4Subject: [PATCH 4/4] Set gpgme variables with pkg-config, not with cmake 4Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
5 module (which doesn't work properly) 5 (which doesn't work properly)
6 6
7Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] 7Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
9--- 10---
10 CMakeLists.txt | 3 ++- 11 CMakeLists.txt | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-) 12 1 file changed, 2 insertions(+), 1 deletion(-)
12 13
13diff --git a/CMakeLists.txt b/CMakeLists.txt 14diff --git a/CMakeLists.txt b/CMakeLists.txt
14index ef07d2d..f1fa09b 100644 15index 0f7271f..d71373f 100644
15--- a/CMakeLists.txt 16--- a/CMakeLists.txt
16+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
17@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) 18@@ -30,7 +30,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED)
18 PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) 19 PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl)
19 FIND_PACKAGE(EXPAT REQUIRED) 20 PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
20 FIND_PACKAGE(CURL REQUIRED) 21 FIND_PACKAGE(CURL REQUIRED)
21-FIND_PACKAGE(Gpgme REQUIRED) 22-FIND_PACKAGE(Gpgme REQUIRED)
22+PKG_CHECK_MODULES(GPGME gpgme REQUIRED) 23+PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
23+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) 24+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
24 FIND_PACKAGE(Xattr REQUIRED)
25 25
26 INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS}) 26 INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
27-- 27
282.11.0
29