diff options
| author |   Brian Evans <grknight@gentoo.org> | 2017-07-09 16:35:44 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2017-07-09 16:35:44 -0400 |
| commit | 9e58ec2885d906c33006e4df0ec07de508afc2e4 (patch) | |
| tree | ba0e0550c9a239fb05839dcaf1cb7e40f8963760 | |
| parent | Add patch for 10.2.6 GSSAPI detection via pkg-config (diff) | |
| download | mysql-extras-9e58ec2885d906c33006e4df0ec07de508afc2e4.tar.gz mysql-extras-9e58ec2885d906c33006e4df0ec07de508afc2e4.tar.bz2 mysql-extras-9e58ec2885d906c33006e4df0ec07de508afc2e4.zip | |
Fix some variable detections for GSSAPI pluginsmysql-extras-20170719-0024Z
| -rw-r--r-- | 20025_all_mariadb-10.2.6-gssapi-detect.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/20025_all_mariadb-10.2.6-gssapi-detect.patch b/20025_all_mariadb-10.2.6-gssapi-detect.patch index b828a52..aeffff4 100644 --- a/20025_all_mariadb-10.2.6-gssapi-detect.patch +++ b/20025_all_mariadb-10.2.6-gssapi-detect.patch @@ -17,11 +17,11 @@ diff -aurN a/libmariadb/cmake/FindGSSAPI.cmake b/libmariadb/cmake/FindGSSAPI.cma + ENDIF() + ENDIF() + IF(GSSAPI_FOUND) -+ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") ++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBRARIES}") + -+ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "") -+ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "") -+ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "") ++ 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() @@ -50,11 +50,11 @@ diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmak + ENDIF() + ENDIF() + IF(GSSAPI_FOUND) -+ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") ++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBRARIES}") + -+ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "") -+ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "") -+ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "") ++ 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() |