From unknown Sun Jun 22 17:14:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62863] [PATCH core-updates] gnu: openldap: Fix build. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Apr 2023 15:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62863 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62863@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168157185814555 (code B ref -1); Sat, 15 Apr 2023 15:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Apr 2023 15:17:38 +0000 Received: from localhost ([127.0.0.1]:49984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnhek-0003mf-4t for submit@debbugs.gnu.org; Sat, 15 Apr 2023 11:17:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:33356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnheh-0003mX-CC for submit@debbugs.gnu.org; Sat, 15 Apr 2023 11:17:36 -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 1pnheh-0003j6-6H for guix-patches@gnu.org; Sat, 15 Apr 2023 11:17:35 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnheT-0002ZU-Mz for guix-patches@gnu.org; Sat, 15 Apr 2023 11:17:34 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 9F5BE1851E0; Sat, 15 Apr 2023 15:17:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1681571838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=3in4BKNHQuHM5d/mWEH6CNiTSVEOZmImJL2iyAvLHvE=; b=mP1oiv27tVsBd8KZzv2QCoWF64g0vRzb/NF7ILsRdT4pP9ua0Oj7ppFoIkB6GA8gEfkPgD 3EqbVTGxn2MPaAdIASOhpW12te/Tp57MEHW8fdSMwUOojIqs++cCEa/MHMVsI1nHIgkZLu Cw4jfDNA+v2MSf6hlEf1wBOA+SgOblXnii/8tzjCKRGw18xG6xEu9S7ii7uNgoYOVtDiXJ 6q9jjn2VGu9CPhmjNBRW0JZ+jJrACToUNIeS6IpgYbEHwE/h2n8M6nmUSjJg4mM6Cuaoxt I+fLDbZx+0khMzrLNmNVwTd4PvfGjyUqRZ0YCrVCTnd9CSlW5/KNNBbABZ8+Qg== From: Josselin Poiret Date: Sat, 15 Apr 2023 17:17:11 +0200 Message-Id: <1127358858c069da42652a37105f542991757304.1681571782.git.dev@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** X-Spamd-Bar: ++++ Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz 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_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/openldap.scm (openldap): Switch arguments to g-exps. Also, do not try to patch libldap_r.la which doesn't exist anymore. --- gnu/packages/openldap.scm | 67 +++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index 7409848795..42fc8269ac 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -84,47 +84,46 @@ (define-public openldap (base32 "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj")))) (build-system gnu-build-system) - (inputs (list bdb-5.3 cyrus-sasl gnutls libgcrypt zlib)) + (inputs (list bdb-5.3 cyrus-sasl gnutls libgcrypt mit-krb5 zlib)) (native-inputs (list libtool groff bdb-5.3)) (arguments - `(#:tests? #f - #:configure-flags - '("--disable-static" + (list + #: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 + ;; 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 _ + (setenv "CC" #$(cc-for-target)) + (setenv "STRIP" #$(string-append (%current-target-system) "-strip"))))) + #~()) + (add-after 'install 'patch-sasl-path + ;; Give -L arguments for cyrus-sasl to avoid propagation. + (lambda* (#:key inputs #:allow-other-keys) + (let ((krb5-lib (basename (search-input-file inputs "lib/libkrb5.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 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* (list (string-append #$output "/lib/libldap.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 )~%")))))))) (synopsis "Implementation of the Lightweight Directory Access Protocol") (description "OpenLDAP is a free implementation of the Lightweight Directory Access Protocol.") -- 2.39.2 From unknown Sun Jun 22 17:14:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62863] [PATCH core-updates] gnu: openldap: Fix build. References: <1127358858c069da42652a37105f542991757304.1681571782.git.dev@jpoiret.xyz> In-Reply-To: <1127358858c069da42652a37105f542991757304.1681571782.git.dev@jpoiret.xyz> Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Apr 2023 05:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62863 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62863@debbugs.gnu.org, Marius Bakke Received: via spool by 62863-submit@debbugs.gnu.org id=B62863.16816212559217 (code B ref 62863); Sun, 16 Apr 2023 05:01:01 +0000 Received: (at 62863) by debbugs.gnu.org; 16 Apr 2023 05:00:55 +0000 Received: from localhost ([127.0.0.1]:50439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnuVT-0002Ob-7q for submit@debbugs.gnu.org; Sun, 16 Apr 2023 01:00:55 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:38511) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnuVJ-0002OF-Pn for 62863@debbugs.gnu.org; Sun, 16 Apr 2023 01:00:53 -0400 Date: Sun, 16 Apr 2023 05:00:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1681621239; x=1681880439; bh=NC4khlmEOinRd5ylGjklDNZYTxUfEZPAznquPSMUU6Q=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=cEjIKHNY4HKtabJqtirknL31F1Ac7+4FehJ3RC27sZE3D4NphbA2nqFISuYYC65l7 auXHqeLwcXcNmXHtmNx9AaC3bcVTkiiu/DzMcisX39/3fwhARbr33yhtj6a+IS42hD VfDMnSU3CumOkUvdv4Nbp03+kpULWDzCN47JxzFEVF2pPCkYtR6RPBesDpFqzmzALA 2PihTEt7xabDoS04TuFgGdFz8MjWwes92Dmw3SBGkuYtSSsI/wY4s0FwaIPR8QZb7y 2fLudbKZVZRmSgBKaiBTu1riIwYwVDT5rmKffEXmjfSdCNqdqYUTM+ksFkFCnFxZ7T OzyX9V1V1JNEw== From: John Kehayias Message-ID: <87o7nos9pf.fsf@protonmail.com> Feedback-ID: 7805494:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, (sending to both related patches, not sure which will be applied and I'm not familiar with openldap enough to finalize the fixes; also CC'ing Marius as author of the related commit) I think the patch-sasl-path phase was meant to be removed, as it was in https://git.savannah.gnu.org/cgit/guix.git/commit/?h=3Dcore-updates&id=3D0d= e5e6d6536a7bc94dd71047cf9573d71fa8d4b0 and I believe restored (erroneously I'm guessing) in the master merge in January. So I think that can be dropped completely. Hope this helps! John From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 16 07:38:43 2023 Received: (at control) by debbugs.gnu.org; 16 Apr 2023 11:38:43 +0000 Received: from localhost ([127.0.0.1]:50698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1po0iR-0004pP-0J for submit@debbugs.gnu.org; Sun, 16 Apr 2023 07:38:43 -0400 Received: from coleridge.kublai.com ([166.84.7.167]:56280 helo=mail.spork.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1po0iP-0004pH-8B for control@debbugs.gnu.org; Sun, 16 Apr 2023 07:38:41 -0400 Received: from psyduck (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 9E32287EA for ; Sun, 16 Apr 2023 07:38:39 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1681645120; bh=XZllS0iDK9s5XkcwiauafqqAgtxanG0VgEqj9CCdP7I=; h=Date:To:From:Subject; b=KB09p5WKoJhlUGEOHcFF5vKunk3wwUmUCQEV4gY48mwOOe2sbFGPGV3mmTYxJ4xoJ cflFcykZQXU2yOJocLWvh8cgX/7O0PSr5TWC4zcKT9ID89HN4eqo02fhrTJWdQngNs VrgfwTW+zoYQlCTjjp5Z9H8m+QuZBQfRr8PhlO4Q= Date: Sun, 16 Apr 2023 07:38:27 -0400 Message-Id: <87h6tgt5u4.fsf@psyduck.jhoto.kublai.com> To: control@debbugs.gnu.org From: Brian Cully Subject: control message for bug #62859 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 62859 62863 quit From unknown Sun Jun 22 17:14:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62863] Openldap in core-updates Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 16 Apr 2023 12:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62863 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: guix-devel@gnu.org Cc: 62859-done@debbugs.gnu.org, 62863-done@debbugs.gnu.org Received: via spool by 62863-done@debbugs.gnu.org id=D62863.168164640830871 (code D ref 62863); Sun, 16 Apr 2023 12:01:03 +0000 Received: (at 62863-done) by debbugs.gnu.org; 16 Apr 2023 12:00:08 +0000 Received: from localhost ([127.0.0.1]:50725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1po139-00081r-Ln for submit@debbugs.gnu.org; Sun, 16 Apr 2023 08:00:07 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:48658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1po136-00080O-0Q; Sun, 16 Apr 2023 08:00:04 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 0D97817ED; Sun, 16 Apr 2023 13:59:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rygcy2LuYHPI; Sun, 16 Apr 2023 13:59:57 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 5B265709; Sun, 16 Apr 2023 13:59:57 +0200 (CEST) Date: Sun, 16 Apr 2023 13:59:55 +0200 From: Andreas Enge Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sun, Apr 16, 2023 at 01:09:02PM +0200 schrieb Andreas Enge: > A single package holds up a lot (gtk+ and so on): openldap. It was pointed out to me on IRC that there are already two fixes available on our issue tracker! I applied one of them and also removed the additional phase as suggested there. In a separate commit, I also updated to 2.6.4 and removed the non-hidden openldap-for-linphone variable, which had the confusing effect that the command line would refer to this package (so "guix refresh -l openldap" showed almost no dependents, for instance). If any of these pose problems, we should selectively revert part of the commits; but I am rather optimistic, as both versions create a library with the same soname. Thanks to all involved! Andreas