Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql-extras:master commit in: /
Date: Sat, 29 Jul 2017 01:13:58
Message-Id: 1501290796.1fc8fcc82ad4eb28e68a5fa70bf8ea683e9643f6.grknight@gentoo
1 commit: 1fc8fcc82ad4eb28e68a5fa70bf8ea683e9643f6
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 29 01:13:16 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 29 01:13:16 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=1fc8fcc8
7
8 20025: Additionally add -krb5 to pkg-config part2
9
10 20025_all_mariadb-10.2.6-gssapi-detect.patch | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
12
13 diff --git a/20025_all_mariadb-10.2.6-gssapi-detect.patch b/20025_all_mariadb-10.2.6-gssapi-detect.patch
14 index 7687e3d..8eec8d2 100644
15 --- a/20025_all_mariadb-10.2.6-gssapi-detect.patch
16 +++ b/20025_all_mariadb-10.2.6-gssapi-detect.patch
17 @@ -7,11 +7,11 @@ diff -aurN a/libmariadb/cmake/FindGSSAPI.cmake b/libmariadb/cmake/FindGSSAPI.cma
18
19 + find_package(PkgConfig)
20 + IF(PKG_CONFIG_FOUND)
21 -+ pkg_search_module(GSSAPI mit-krb5-gssapi mit-krb5)
22 ++ pkg_check_modules(GSSAPI mit-krb5-gssapi mit-krb5)
23 + IF(GSSAPI_FOUND)
24 + set(GSSAPI_FLAVOR "MIT")
25 + ELSE()
26 -+ pkg_search_module(GSSAPI heimdal-gssapi heimdal-krb5)
27 ++ pkg_check_modules(GSSAPI heimdal-gssapi heimdal-krb5)
28 + IF(GSSAPI_FOUND)
29 + set(GSSAPI_FLAVOR "HEIMDAL")
30 + ENDIF()
31 @@ -40,11 +40,11 @@ diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmak
32
33 + find_package(PkgConfig)
34 + IF(PKG_CONFIG_FOUND)
35 -+ pkg_search_module(GSSAPI mit-krb5-gssapi mit-krb5)
36 ++ pkg_check_modules(GSSAPI mit-krb5-gssapi mit-krb5)
37 + IF(GSSAPI_FOUND)
38 + set(GSSAPI_FLAVOR "MIT")
39 + ELSE()
40 -+ pkg_search_module(GSSAPI heimdal-gssapi heimdal-krb5)
41 ++ pkg_check_modules(GSSAPI heimdal-gssapi heimdal-krb5)
42 + IF(GSSAPI_FOUND)
43 + set(GSSAPI_FLAVOR "HEIMDAL")
44 + ENDIF()
Report Message
Find on MARC Find on Google Groups