diff options
| author | Marius Bakke <marius@gnu.org> | 2022-07-22 14:50:02 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-07-23 19:43:11 +0200 |
| commit | 0de5e6d6536a7bc94dd71047cf9573d71fa8d4b0 (patch) | |
| tree | 3adeabf83d49a68945771b9b2db15386fd6bff69 /gnu | |
| parent | 1ecf710caed394e066aa0e5a74aa5128d777a329 (diff) | |
| download | guix-0de5e6d6536a7bc94dd71047cf9573d71fa8d4b0.tar.gz | |
gnu: cyrus-sasl: Do not propagate Kerberos.
* gnu/packages/cyrus-sasl.scm (cyrus-sasl)[propagated-inputs]: Move MIT-KRB5 ... [inputs]: ... here. * gnu/packages/openldap.scm (openldap)[arguments]: Don't add krb5 linker arguments.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/cyrus-sasl.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/openldap.scm | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index 33c054a097..70d579c127 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -45,10 +45,7 @@ (base32 "135kbgyfpa1mwqp5dm223yr6ddzi4vjm7cr414d7rmhys2mwdkvw")))) (build-system gnu-build-system) - (inputs (list gdbm openssl)) - (propagated-inputs - ;; cyrus-sasl.pc refers to -lkrb5, so propagate it. - (list mit-krb5)) + (inputs (list gdbm mit-krb5 openssl)) (arguments (list #:configure-flags #~(list (string-append "--with-plugindir=" diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 0ae415f928..00aef917e2 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -101,13 +101,6 @@ (setenv "CC" (string-append target "-gcc")) (setenv "STRIP" (string-append target "-strip"))))) '()) - (add-after 'install 'patch-sasl-path - ;; Give -L arguments for cyrus-sasl to avoid propagation. - (lambda* (#:key inputs #:allow-other-keys) - (let ((krb5 (search-input-file inputs "/lib/libkrb5.so"))) - (substitute* (string-append #$output "/lib/libldap.la") - (("-lkrb5" lib) - (string-append "-L" (dirname krb5) "/lib " lib)))))) (add-after 'install 'provide-libldap_r (lambda _ ;; The re-entrant libldap_r no longer exists since 2.6 |