1 |
commit: 9e58ec2885d906c33006e4df0ec07de508afc2e4 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 9 20:35:44 2017 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 9 20:35:44 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=9e58ec28 |
7 |
|
8 |
Fix some variable detections for GSSAPI plugins |
9 |
|
10 |
20025_all_mariadb-10.2.6-gssapi-detect.patch | 16 ++++++++-------- |
11 |
1 file changed, 8 insertions(+), 8 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 b828a52..aeffff4 100644 |
15 |
--- a/20025_all_mariadb-10.2.6-gssapi-detect.patch |
16 |
+++ b/20025_all_mariadb-10.2.6-gssapi-detect.patch |
17 |
@@ -17,11 +17,11 @@ diff -aurN a/libmariadb/cmake/FindGSSAPI.cmake b/libmariadb/cmake/FindGSSAPI.cma |
18 |
+ ENDIF() |
19 |
+ ENDIF() |
20 |
+ IF(GSSAPI_FOUND) |
21 |
-+ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") |
22 |
++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBRARIES}") |
23 |
+ |
24 |
-+ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "") |
25 |
-+ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "") |
26 |
-+ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "") |
27 |
++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "" FORCE) |
28 |
++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE) |
29 |
++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "" FORCE) |
30 |
+ |
31 |
+ mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) |
32 |
+ RETURN() |
33 |
@@ -50,11 +50,11 @@ diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmak |
34 |
+ ENDIF() |
35 |
+ ENDIF() |
36 |
+ IF(GSSAPI_FOUND) |
37 |
-+ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") |
38 |
++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBRARIES}") |
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 |
++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "" FORCE) |
44 |
++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE) |
45 |
++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "" FORCE) |
46 |
+ |
47 |
+ mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) |
48 |
+ RETURN() |