diff options
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 | 23 |
1 files changed, 11 insertions, 12 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 73902e5f58..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 @@ | |||
1 | From f5a1dfe4c87c228165bc25e7fe464120d8139a3d Mon Sep 17 00:00:00 2001 | 1 | From b5918f06d790dc346d41de4b3a3ec01f290c1d25 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 |
@@ -6,22 +6,21 @@ Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module | |||
6 | 6 | ||
7 | Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] | 7 | Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] |
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 8 | Signed-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 | ||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
15 | index e949dbe..c954b2e 100644 | 14 | index 6c00024..a2f57af 100644 |
16 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
17 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
18 | @@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) | 17 | @@ -37,7 +37,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) |
19 | PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) | 18 | FIND_PACKAGE(CURL 7.52.0 REQUIRED) |
20 | PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) | ||
21 | FIND_PACKAGE(CURL REQUIRED) | ||
22 | -FIND_PACKAGE(Gpgme REQUIRED) | ||
23 | +PKG_CHECK_MODULES(GPGME gpgme REQUIRED) | ||
24 | +set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) | ||
25 | |||
26 | 19 | ||
27 | IF (WITH_ZCHUNK) | 20 | IF (USE_GPGME) |
21 | - FIND_PACKAGE(Gpgme REQUIRED) | ||
22 | + PKG_CHECK_MODULES(GPGME gpgme REQUIRED) | ||
23 | + set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) | ||
24 | IF (ENABLE_SELINUX) | ||
25 | PKG_CHECK_MODULES(SELINUX REQUIRED libselinux) | ||
26 | ENDIF(ENABLE_SELINUX) | ||