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 | 29 |
1 files changed, 13 insertions, 16 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..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,8 +1,8 @@ -From a36be8192615e2a1fb5a5856d44565277f15583b Mon Sep 17 00:00:00 2001 +From b5918f06d790dc346d41de4b3a3ec01f290c1d25 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 4/4] Set gpgme variables with pkg-config, not with cmake - module (which doesn't work properly) +Subject: [PATCH] Set gpgme variables with pkg-config, not with cmake module + (which doesn't work properly) Upstream-Status: Inappropriate [gpgme upstream does not have pkg-config support and is not interested in it] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> @@ -11,19 +11,16 @@ 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 ef07d2d..f1fa09b 100644 +index 6c00024..a2f57af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -31,7 +31,8 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0 REQUIRED) - PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) - FIND_PACKAGE(EXPAT REQUIRED) - FIND_PACKAGE(CURL REQUIRED) --FIND_PACKAGE(Gpgme REQUIRED) -+PKG_CHECK_MODULES(GPGME gpgme REQUIRED) -+set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) - FIND_PACKAGE(Xattr REQUIRED) +@@ -37,7 +37,8 @@ PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) + FIND_PACKAGE(CURL 7.52.0 REQUIRED) - INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS}) --- -2.11.0 - + IF (USE_GPGME) +- FIND_PACKAGE(Gpgme REQUIRED) ++ PKG_CHECK_MODULES(GPGME gpgme REQUIRED) ++ set(GPGME_VANILLA_LIBRARIES ${GPGME_LIBRARIES}) + IF (ENABLE_SELINUX) + PKG_CHECK_MODULES(SELINUX REQUIRED libselinux) + ENDIF(ENABLE_SELINUX) |