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.patch16
1 files changed, 6 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 a0a4d490f1..fd1df95473 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 @@
1From 25113b34bc1aae377d7bf447e69528783e2c177e Mon Sep 17 00:00:00 2001 1From b5918f06d790dc346d41de4b3a3ec01f290c1d25 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] Set gpgme variables with pkg-config, not with cmake module 4Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
@@ -6,25 +6,21 @@ Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module
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
10--- 9---
11 CMakeLists.txt | 3 ++- 10 CMakeLists.txt | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-) 11 1 file changed, 2 insertions(+), 1 deletion(-)
13 12
14diff --git a/CMakeLists.txt b/CMakeLists.txt 13diff --git a/CMakeLists.txt b/CMakeLists.txt
15index cd975a8..713cc87 100644 14index 6c00024..a2f57af 100644
16--- a/CMakeLists.txt 15--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 16+++ b/CMakeLists.txt
18@@ -35,7 +35,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) 17@@ -37,7 +37,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED)
19 FIND_PACKAGE(CURL 7.52.0 REQUIRED) 18 FIND_PACKAGE(CURL 7.52.0 REQUIRED)
20 19
21 IF (USE_GPGME) 20 IF (USE_GPGME)
22- FIND_PACKAGE(Gpgme REQUIRED) 21- FIND_PACKAGE(Gpgme REQUIRED)
23+ PKG_CHECK_MODULES(GPGME gpgme REQUIRED) 22+ PKG_CHECK_MODULES(GPGME gpgme REQUIRED)
24+ set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) 23+ set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES})
25 ELSE (USE_GPGME) 24 IF (ENABLE_SELINUX)
26 PKG_CHECK_MODULES(RPM REQUIRED rpm>=4.18.0) 25 PKG_CHECK_MODULES(SELINUX REQUIRED libselinux)
27 ENDIF (USE_GPGME) 26 ENDIF(ENABLE_SELINUX)
28--
292.34.1
30