commit:     848893453814ffa2b548180a1b3cdd96ec187a6f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 12:08:18 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 12:08:18 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=84889345

Respin GSSAPI detection patch for 10.1.26

 20025_all_mariadb-10.1.26-gssapi-detect.patch | 33 +++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/20025_all_mariadb-10.1.26-gssapi-detect.patch 
b/20025_all_mariadb-10.1.26-gssapi-detect.patch
new file mode 100644
index 0000000..846737e
--- /dev/null
+++ b/20025_all_mariadb-10.1.26-gssapi-detect.patch
@@ -0,0 +1,33 @@
+diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake 
b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake
+--- a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake        2017-05-14 
19:13:17.000000000 -0400
++++ b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake        2017-06-28 
14:42:30.307704810 -0400
+@@ -39,6 +39,29 @@
+ 
+ else(GSSAPI_LIBS AND GSSAPI_FLAVOR)
+ 
++  find_package(PkgConfig)
++  IF(PKG_CONFIG_FOUND)
++    pkg_check_modules(GSSAPI mit-krb5-gssapi mit-krb5)
++    IF(GSSAPI_FOUND)
++      set(GSSAPI_FLAVOR "MIT")
++    ELSE()
++      pkg_check_modules(GSSAPI heimdal-gssapi heimdal-krb5)
++      IF(GSSAPI_FOUND)
++        set(GSSAPI_FLAVOR "HEIMDAL")
++      ENDIF()
++    ENDIF()
++    IF(GSSAPI_FOUND)
++      message(STATUS "Found GSSAPI: ${GSSAPI_LIBRARIES}")
++
++      set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "" FORCE)
++      set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE)
++      set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "" FORCE)
++
++      mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR)
++      RETURN()
++    ENDIF()
++  ENDIF(PKG_CONFIG_FOUND)
++
+   find_program(KRB5_CONFIG NAMES krb5-config heimdal-krb5-config PATHS
+      /opt/local/bin
+      ONLY_CMAKE_FIND_ROOT_PATH               # this is required when cross 
compiling with cmake 2.6 and ignored with cmake 2.4, Alex

Reply via email to