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: Wed, 28 Jun 2017 18:47:12
Message-Id: 1498675608.7885817ceeeac4deac019c594e3e0333dfb8ff93.grknight@gentoo
1 commit: 7885817ceeeac4deac019c594e3e0333dfb8ff93
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 28 18:46:48 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 28 18:46:48 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=7885817c
7
8 Add patch for 10.2.6 GSSAPI detection via pkg-config
9
10 20025_all_mariadb-10.2.6-gssapi-detect.patch | 66 ++++++++++++++++++++++++++++
11 1 file changed, 66 insertions(+)
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 new file mode 100644
15 index 0000000..b828a52
16 --- /dev/null
17 +++ b/20025_all_mariadb-10.2.6-gssapi-detect.patch
18 @@ -0,0 +1,66 @@
19 +diff -aurN a/libmariadb/cmake/FindGSSAPI.cmake b/libmariadb/cmake/FindGSSAPI.cmake
20 +--- a/libmariadb/cmake/FindGSSAPI.cmake 2017-05-14 19:13:15.000000000 -0400
21 ++++ b/libmariadb/cmake/FindGSSAPI.cmake 2017-06-28 14:43:30.324029111 -0400
22 +@@ -46,6 +46,29 @@
23 +
24 + else(GSSAPI_LIBS AND GSSAPI_FLAVOR)
25 +
26 ++ find_package(PkgConfig)
27 ++ IF(PKG_CONFIG_FOUND)
28 ++ pkg_search_module(GSSAPI mit-krb5-gssapi)
29 ++ IF(GSSAPI_FOUND)
30 ++ set(GSSAPI_FLAVOR "MIT")
31 ++ ELSE()
32 ++ pkg_search_module(GSSAPI heimdal-gssapi)
33 ++ IF(GSSAPI_FOUND)
34 ++ set(GSSAPI_FLAVOR "HEIMDAL")
35 ++ ENDIF()
36 ++ ENDIF()
37 ++ IF(GSSAPI_FOUND)
38 ++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}")
39 ++
40 ++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "")
41 ++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "")
42 ++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "")
43 ++
44 ++ mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR)
45 ++ RETURN()
46 ++ ENDIF()
47 ++ ENDIF(PKG_CONFIG_FOUND)
48 ++
49 + find_program(KRB5_CONFIG NAMES krb5-config PATHS
50 + /opt/local/bin
51 + /usr/lib/mit/bin/
52 +diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake
53 +--- a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake 2017-05-14 19:13:17.000000000 -0400
54 ++++ b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake 2017-06-28 14:42:30.307704810 -0400
55 +@@ -39,6 +39,29 @@
56 +
57 + else(GSSAPI_LIBS AND GSSAPI_FLAVOR)
58 +
59 ++ find_package(PkgConfig)
60 ++ IF(PKG_CONFIG_FOUND)
61 ++ pkg_search_module(GSSAPI mit-krb5-gssapi)
62 ++ IF(GSSAPI_FOUND)
63 ++ set(GSSAPI_FLAVOR "MIT")
64 ++ ELSE()
65 ++ pkg_search_module(GSSAPI heimdal-gssapi)
66 ++ IF(GSSAPI_FOUND)
67 ++ set(GSSAPI_FLAVOR "HEIMDAL")
68 ++ ENDIF()
69 ++ ENDIF()
70 ++ IF(GSSAPI_FOUND)
71 ++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}")
72 ++
73 ++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "")
74 ++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "")
75 ++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "")
76 ++
77 ++ mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR)
78 ++ RETURN()
79 ++ ENDIF()
80 ++ ENDIF(PKG_CONFIG_FOUND)
81 ++
82 + find_program(KRB5_CONFIG NAMES krb5-config heimdal-krb5-config PATHS
83 + /opt/local/bin
84 + ONLY_CMAKE_FIND_ROOT_PATH # this is required when cross compiling with cmake 2.6 and ignored with cmake 2.4, Alex