From patchwork Sun Mar 9 17:26:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 39974 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 CBA1E27BBE2; Sun, 9 Mar 2025 17:38:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 DD18F27BBE9 for ; Sun, 9 Mar 2025 17:38:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trKbI-0001Uw-SB; Sun, 09 Mar 2025 13:38:10 -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 1trKbD-0001UY-2q for guix-patches@gnu.org; Sun, 09 Mar 2025 13:38:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1trKbC-0001Jg-O1 for guix-patches@gnu.org; Sun, 09 Mar 2025 13:38:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=S0+r7MxEat1MxuSUdLxzaTXz9wZfVI5n88a3YKHTFEg=; b=Fc6g6cmPrM7dgSR36YE8Fm/1RRFKvIu/GYgPLH5Qj06Dmy7Q3zr03AEegjTaTiUvsPuo9B7Ts9a3le4cyYxAodZDGgms2DE64lzy83taeZsU3ltQXFH4fZcz6qISfshp7dwEESpViVfBMLrArXrEfpySXxov1UiqZK/IYr2m5CNbS0QnA2PJXELXJv8sirNcIGbOBWd3wU1wMTBJUu0a/FB40k1oyOc9z3cqIXbqntC6Tugskkgu9VGxydu/3QBidvXMB+9kG3uZa6iAmw0yUSmjc6hb/CK4GG2YBpTWUus7jbsOE3l+3fHIXwgYxMFybrRaYhS35NwRewW7txW86w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1trKbC-0001QW-Bw for guix-patches@gnu.org; Sun, 09 Mar 2025 13:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76896] [PATCH core-packages-team] gnu: minizip: Remove phase 'remove-crypt-h. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Mar 2025 17:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 76896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76896@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17415418365425 (code B ref -1); Sun, 09 Mar 2025 17:38:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Mar 2025 17:37:16 +0000 Received: from localhost ([127.0.0.1]:34152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1trKaS-0001PR-59 for submit@debbugs.gnu.org; Sun, 09 Mar 2025 13:37:16 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49620) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1trKaO-0001P9-Qo for submit@debbugs.gnu.org; Sun, 09 Mar 2025 13:37:13 -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 1trKaI-0000hg-1u for guix-patches@gnu.org; Sun, 09 Mar 2025 13:37:06 -0400 Received: from 2.mo575.mail-out.ovh.net ([46.105.52.162]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trKaE-00011T-Rv for guix-patches@gnu.org; Sun, 09 Mar 2025 13:37:05 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.17.34]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4Z9nJn6sJdz1pM2 for ; Sun, 9 Mar 2025 17:36:57 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-mdbx2 (unknown [10.111.174.42]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6F68E1FD42 for ; Sun, 9 Mar 2025 17:36:57 +0000 (UTC) Received: from ngraves.fr ([37.59.142.112]) by ghost-submission-5b5ff79f4f-mdbx2 with ESMTPSA id PHzUM7jRzWc4hgAAt5tEXw (envelope-from ) for ; Sun, 09 Mar 2025 17:36:57 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-112S00634a325d7-f192-4b26-a743-409d252d4af1, 196D73215860B9B374AEA1D4B43499A65472C7F7) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 9 Mar 2025 18:26:50 +0100 Message-ID: <87tt82ksw8.fsf@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 15112110025783173882 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduudejtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvffufffkgggtgfesthhqredttddtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeffveethfehffeutdelleekkefhvdefhffhieevfeeffeeltdduffetteegffeugeenucffohhmrghinhepfhgvughorhgrphhrohhjvggtthdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddrudduvdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehjeehmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=S0+r7MxEat1MxuSUdLxzaTXz9wZfVI5n88a3YKHTFEg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1741541818; v=1; b=s6GQWl2wCvhd8MDBkKyhH/MMrXRVcYoTfmRQQlY/k29Po7921WJwwYPzzPsGnuX506D3yr0N KeZDVRKkVHAqxLi4z/pNCgFDqPx0qxAu23Tja5FVv6Olxc4qGB/ObGtX8fXwuYR+hXeirbtGgaG C865oF1L8Nqr52GRD5kTueh8dtq2tKAT9THKqX18WP84wlpzH+M9bH7Zq9aOVz8N6t/n0gyksxR eH8XSJ+EejYAwwQshXbXc1v9dVHsXK8pxKtkzhUKNvh4buLwqBMcG2KGclc8yAh6fbC0JrBceTv r13zPQZVun+cYNDvTfzL0j4mV6mgxa1FmUkMq4MJnZ8/Q== Received-SPF: pass client-ip=46.105.52.162; envelope-from=ngraves@ngraves.fr; helo=2.mo575.mail-out.ovh.net 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, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 During the update of glibc from 2.35 to 2.39, the crypt.h header has been removed from glibc's include path. Packages depending on this header from minizip have no access to it anymore. Remove this phase. (I stumbled on that trying to package libkml, I don't know if I'll end up sending the package (might not be needed and old), but I guess this applies anyway). * gnu/packages/compression.scm (minizip)[arguments]{phases}: Delete 'remove-crypt-h phase. --- gnu/packages/compression.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index df876f7373..8b4ff65cda 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -183,16 +183,7 @@ (define-public minizip `(#:phases (modify-phases %standard-phases (add-after 'unpack 'enter-source - (lambda _ (chdir "contrib/minizip") #t)) - (add-after 'install 'remove-crypt-h - (lambda* (#:key outputs #:allow-other-keys) - ;; Remove because it interferes with libc's - ;; given that 'minizip.pc' says "-I…/include/minizip". - ;; Fedora does the same: - ;; . - (let ((out (assoc-ref outputs "out"))) - (delete-file (string-append out "/include/minizip/crypt.h")) - #t)))))) + (lambda _ (chdir "contrib/minizip")))))) (native-inputs (list autoconf automake libtool)) (propagated-inputs (list zlib))