From patchwork Sat Apr 15 13:52:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Cully X-Patchwork-Id: 49177 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1EDF717570; Sat, 15 Apr 2023 14:54:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D07F173FD for ; Sat, 15 Apr 2023 14:54:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pngM7-0000Ti-E8; Sat, 15 Apr 2023 09:54:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pngLy-0000TP-U5 for guix-patches@gnu.org; Sat, 15 Apr 2023 09:54:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pngLq-00042n-Np for guix-patches@gnu.org; Sat, 15 Apr 2023 09:54:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pngLq-0000yE-GF for guix-patches@gnu.org; Sat, 15 Apr 2023 09:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62859] [PATCH core-updates] gnu: openldap: core-updates build fixes Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Apr 2023 13:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62859 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62859@debbugs.gnu.org Cc: Brian Cully X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16815667943649 (code B ref -1); Sat, 15 Apr 2023 13:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Apr 2023 13:53:14 +0000 Received: from localhost ([127.0.0.1]:48554 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pngL3-0000wm-NL for submit@debbugs.gnu.org; Sat, 15 Apr 2023 09:53:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:57770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pngL0-0000we-P7 for submit@debbugs.gnu.org; Sat, 15 Apr 2023 09:53:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pngL0-0000ID-GO for guix-patches@gnu.org; Sat, 15 Apr 2023 09:53:10 -0400 Received: from coleridge.kublai.com ([166.84.7.167] helo=mail.spork.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pngKy-0003vE-CE for guix-patches@gnu.org; Sat, 15 Apr 2023 09:53:10 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 02C6686BD; Sat, 15 Apr 2023 09:53:00 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1681566787; bh=mL4kvhDv8ZmHiQOjjUdxoEV0oKAS41hanzBx6onFwqs=; h=From:To:Cc:Subject:Date; b=rmbGGX3FJul1DLdvUWfxwq4wL3k2TicUlvWgWLpV/koJXt4sy4YVFYRAIemurUJD0 yiOmO3ubUHLvR7MQi8eaVPD7z38Rs3gDll+tolGi8C6j/6joBZ17BEWfcOEbwkbWHG w91XLVrxh4aVN0Unq8Sa66cC9rlBCwMwSxpxTxZw= Date: Sat, 15 Apr 2023 09:52:27 -0400 Message-Id: <3fe8a172b84e74c0442d74e48d3eff3cf5e92597.1681566668.git.bjc@spork.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=166.84.7.167; envelope-from=bjc@spork.org; helo=mail.spork.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Brian Cully X-ACL-Warn: , Brian Cully via Guix-patches X-Patchwork-Original-From: Brian Cully via Guix-patches via From: Brian Cully Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Change quoting to use gexps, so that ungexping in the build phases doesn't fail with a syntax error. Remove references to libldap_r.so and .la, since they're no longer being built, and manually patching in a .so library when there's no corresponding .la seems like something that should be removed, with dependent packages updated, if necessary. * gnu/packages/openldap.scm (openldap): update quoting to use gexps, remove reference to libldap_r.la, which no longer exists, and remove custom install of libldap_r.so. --- gnu/packages/openldap.scm | 67 ++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 37 deletions(-) base-commit: 7ccf9943029747d4ba97160214f895b365511278 prerequisite-patch-id: 3a0a1be9df9a40370ebadd64ad6163c1a4f2bc4d prerequisite-patch-id: 04bc0329678ccd5fe51be207d86dc8a4ce969c8b prerequisite-patch-id: 7edab399c6512d85ed849f0877ccc9602888f1c8 diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 7409848795..4d3810ecfb 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -87,44 +87,37 @@ (define-public openldap (inputs (list bdb-5.3 cyrus-sasl gnutls libgcrypt zlib)) (native-inputs (list libtool groff bdb-5.3)) (arguments - `(#:tests? #f - #:configure-flags - '("--disable-static" - ,@(if (%current-target-system) - '("--with-yielding_select=yes" - "ac_cv_func_memcmp_working=yes") - '())) - ;; Disable install stripping as it breaks cross-compiling. - #:make-flags '("STRIP=") - #:phases - (modify-phases %standard-phases - ,@(if (%current-target-system) - '((add-before 'configure 'fix-cross-gcc - (lambda* (#:key target #:allow-other-keys) - (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 outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (krb5 (assoc-ref inputs "mit-krb5"))) ;propagated from cyrus-sasl + (list + #:tests? #f + #:configure-flags + #~(list "--disable-static" + #$@(if (%current-target-system) + '("--with-yielding_select=yes" + "ac_cv_func_memcmp_working=yes") + '())) + ;; Disable install stripping as it breaks cross-compiling. + #:make-flags + #~(list "STRIP=") + #:phases + #~(modify-phases %standard-phases + #$@(if (%current-target-system) + '((add-before 'configure 'fix-cross-gcc + (lambda* (#:key target #:allow-other-keys) + (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 outputs #:allow-other-keys) + (let ((krb5 (assoc-ref inputs "mit-krb5"))) ;propagated from cyrus-sasl - ;; The ancient Libtool bundled with OpenLDAP copies the linker flags - ;; from Cyrus-SASL and embeds them into its own .la files. Add an - ;; absolute reference to Kerberos so it does not have to be propagated. - (substitute* (map (lambda (f) (string-append out "/" f)) - '("lib/libldap.la" "lib/libldap_r.la")) - (("-lkrb5" lib) - (string-append "-L" krb5 "/lib " lib)))))) - (add-after 'install 'provide-libldap_r - (lambda _ - ;; The re-entrant libldap_r no longer exists since 2.6 - ;; as it has become the default: provide a linker alias - ;; for now. - (call-with-output-file (string-append #$output "/lib/libldap_r.so") - (lambda (port) - (format port "INPUT ( libldap.so )~%")))))))) + ;; The ancient Libtool bundled with OpenLDAP copies the linker flags + ;; from Cyrus-SASL and embeds them into its own .la files. Add an + ;; absolute reference to Kerberos so it does not have to be propagated. + (substitute* (map (lambda (f) (string-append #$output "/" f)) + '("lib/libldap.la")) + (("-lkrb5" lib) + (string-append "-L" krb5 "/lib " lib))))))))) (synopsis "Implementation of the Lightweight Directory Access Protocol") (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.")