diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-31 10:31:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-04-02 18:22:37 +0200 |
| commit | 7b527e6334c0d16e333ce74e18a63b56e9a4bac9 (patch) | |
| tree | 31bac36de33de4e887b07bf44761f56a404a763d /plugin | |
| parent | 0b2042fdca28eb6a9d58eaef96e6e6fe5ae359aa (diff) | |
| download | mariadb-git-7b527e6334c0d16e333ce74e18a63b56e9a4bac9.tar.gz | |
cmake: fix krb5 detection on SUSE
`zypper install krb5-devel` installs executables outside of $PATH.
It also installs /etc/profile.d/krb5.sh that is sourced by a new
shell to add the new location to the $PATH. But this doesn't affect
the current shell.
Now decent Linux distros remind the user to run `. /etc/profile`
to reload paths in such a case. SUSE doesn't and for a good reason -
it doesn't work there. Because SUSE sets PROFILEREAD=true in the
environment and /etc/profile does not do anything.
By this point, one should not really expect `unset PROFILEREAD` to help,
and it does not - PROFILEREAD is readonly, and cannot be unset.
Apparently SUSE really *really* wants you to re-login between installing
MariaDB build dependencies and actually running the rpmbuild.
Which we cannot do it buildbot. And it would look very user-un-friendly
in the Build Instructions section of the manual.
So, we work around it - by adding SUSE krb5 path to the search list.
THIS IS SUSEEEEEE!!!
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_gssapi/cmake/FindGSSAPI.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake index cc8e62d1ca7..67309eed1ee 100644 --- a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake +++ b/plugin/auth_gssapi/cmake/FindGSSAPI.cmake @@ -40,7 +40,7 @@ if(GSSAPI_LIBS AND GSSAPI_FLAVOR) else(GSSAPI_LIBS AND GSSAPI_FLAVOR) find_program(KRB5_CONFIG NAMES krb5-config heimdal-krb5-config PATHS - /opt/local/bin + /opt/local/bin /usr/lib/mit/bin ONLY_CMAKE_FIND_ROOT_PATH # this is required when cross compiling with cmake 2.6 and ignored with cmake 2.4, Alex ) mark_as_advanced(KRB5_CONFIG) |