12/25: gnu: cyrus-sasl: Do not propagate Kerberos.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 0de5e6d6536a7bc94dd71047cf9573d71fa8d4b0
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Jul 22 14:50:02 2022 +0200

    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.
---
 gnu/packages/cyrus-sasl.scm | 5 +----
 gnu/packages/openldap.scm   | 7 -------
 2 files changed, 1 insertion(+), 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