From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id sHvlDOPfQmfoAAEAe85BDQ:P1 (envelope-from ) for ; Sun, 24 Nov 2024 08:12:19 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id sHvlDOPfQmfoAAEAe85BDQ (envelope-from ) for ; Sun, 24 Nov 2024 09:12:19 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vr+PkymP; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=St8+xdRO; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732435938; a=rsa-sha256; cv=none; b=csbVFvd0v/m73wxy3OfEeiOLXVv2vrlYYSN5tW54Gg4Rp/PNP1erLVdp387YPhQbv07cfx gpLpZQiNCDxKlQf1+1sjBIfvcyhPAS9wj3SSLpNIMdeC8h5oQYyt10bFB1GSXbhSo1TC2T obJn2F2izCkKCKWTvhuQRRFBNk7qCUpLvduysrkA1oANHBXXJhTf4Ya2/12M4INxu0MDm7 BKldFP/vzncuUTB0+UlQbwnmyRyeV07Fm5ULKMXJuLA7cxj5tIZiOaUKnSaWB3d7FQ4B9H GuxuSBlZz4+rWdDwIbS6rkpDh4Faq1WesnpsQfUuAGnzsQ+LAypTzpkSXrxcSA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vr+PkymP; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=St8+xdRO; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732435938; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=uzE792OzozLBDOeZLY9UG0h9+GGvGGGvinw9jeHBrz4=; b=mDbFmSgxg1pXWrcD6XmUM21csnsVM6KfwjvTnF8IRlgGooPc3cCK45Eg748kITlDqqYT/V 6UjA1uYfH/FsOsvQCzsnI4zk2iWAfgMjNOvGyhx7YnfSUGVnSFRBdNbkfG5/ZnH8aOQXVh xscwWQE7fJGrpQjHZf/6+q4IiEJaXy4Ybv0QOx4uMRPB8BBX/1yPd2TukKoArIbZHXULCl DXjXSjKWKMlWmfZA5UeXOuZHxsUelEppnLEhS7cpX0es2Bxmxh1xEi0DUPzY1eJ9upXxyx zinAe52AlzSvuUMhANXgGr4f9YifFbfJLFi/NVEWGzkP4RlSr+kImmxAZUjEqg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C472A8C1D4 for ; Sun, 24 Nov 2024 09:12:17 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tF7UR-0000BC-9m; Sun, 24 Nov 2024 02:57:07 -0500 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 1tF7UP-0000AZ-7f for guix-patches@gnu.org; Sun, 24 Nov 2024 02:57:05 -0500 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 1tF7UO-0002KJ-V8; Sun, 24 Nov 2024 02:57:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=uzE792OzozLBDOeZLY9UG0h9+GGvGGGvinw9jeHBrz4=; b=vr+PkymPdGijuVVetb06eDnGD8A6C4oYuf89dGJqa8d2SmtVDdJM5zF+QzEesG4CYmrBR5kiKn7oBvbqdyVnvM1f1kcgof2n0YQ/UodTqG6DHRadWOo27XB1IrrmvFoyI98DAh8gr3ffOV0ZxIjiD30pXgXT8Hj1hau9gV/6h2lnaD3qobVD1E8gZqrkX3imQ0N6sLcqaVmVtGXZWf+pc1flI1ElXVs6z6ChzxpsmzvEumFB5lvX36hhGg21hRN8QGI/KHTL56vlmNOd1A7Gz42jqkf8APZa82H84CxVLcF9TWv5IGsD2OZ8DAtBOpnlSpD/mv2/+HkhQ4WjvzhhIg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tF7UO-0004fM-PN; Sun, 24 Nov 2024 02:57:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v4 09/58] gnu: patch: Fix build for the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 24 Nov 2024 07:57:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74290 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74290@debbugs.gnu.org Cc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Andreas Enge , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243497317454 (code B ref 74290); Sun, 24 Nov 2024 07:57:04 +0000 Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:56:13 +0000 Received: from localhost ([127.0.0.1]:60675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TY-0004XK-1a for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tF7TQ-0004Ud-L5 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:56:05 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tF7TL-0001uq-Ec; Sun, 24 Nov 2024 02:55:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=uzE792OzozLBDOeZLY9UG0h9+GGvGGGvinw9jeHBrz4=; b=St8+xdROngfpQe9VCBNw xqnp/FyF8ruMeV0we7K24LK0Ephf/iZwojPxgm591iIy9+F02pM87uGhqWCykk1u0MSKISHzC0SFx rjCsND6VJv4lSj75zVxT/ezN17uX35Vke97k/IRLxp18jNrLtdoiiZts7sPGdaVG19yjN2vYmwB/0 CFFrUQ6XKvcO6zTVr74amXS5pQ0fDMPTq9kGHGXzzcozBpbFiyETP70S7YYlHl/GF1tmRHaH2Dh4Q 9ymS7rgXQk8hdYazBBYKz1PZx8IOYxng35GZnHJtjwdv6eQ3FRb0wRqelGgaIwzcC0rAQ7FsQug3L z9GMHwBsCz0bWw==; From: Janneke Nieuwenhuizen Date: Sun, 24 Nov 2024 08:54:32 +0100 Message-ID: <782e6888544ea859719fdb5cfa9e5a0e16b8adb4.1732434271.git.janneke@gnu.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.98 X-Spam-Score: -6.98 X-Migadu-Queue-Id: C472A8C1D4 X-Migadu-Scanner: mx10.migadu.com X-TUID: 9sXDElEuHrJ/ * gnu/packages/base.scm (patch)[arguments]: When building for the 64bit Hurd, set #:configure-flags. Change-Id: I795a591ef8282ee5b760fec43bd4ad849007f602 --- gnu/packages/base.scm | 49 ++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 010be631d7..83f8c0d9e9 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -339,27 +339,34 @@ (define-public patch "1bk38169c0xh01b0q0zmnrjqz8k9byz3arp4q7q66sn6xwf94nvz")) (patches (search-patches "patch-hurd-path-max.patch")))) (arguments - (substitute-keyword-arguments (package-arguments base) - ((#:phases phases '%standard-phases) - #~(modify-phases #$phases - (add-after 'unpack 'copy-gnulib-sources - (lambda _ - ;; XXX: We copy the source instead of using 'gnulib' as a - ;; native input to avoid introducing a dependency cycle. - (copy-recursively #+gnulib "gnulib") - (setenv "GNULIB_SRCDIR" - (string-append (getcwd) "/gnulib/src/gnulib")))) - (add-after 'copy-gnulib-sources 'update-bootstrap-script - (lambda _ - (copy-file "gnulib/src/gnulib/build-aux/bootstrap" - "bootstrap"))) - (add-after 'unpack 'patch-configure.ac - (lambda _ - (substitute* "configure.ac" - ;; The gnulib-provided git-version-gen script has a plain - ;; shebang of #!/bin/sh; avoid using it. - (("build-aux/git-version-gen" all) - (string-append "sh " all))))))))) + (let ((arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'copy-gnulib-sources + (lambda _ + ;; XXX: We copy the source instead of using 'gnulib' as a + ;; native input to avoid introducing a dependency cycle. + (copy-recursively #+gnulib "gnulib") + (setenv "GNULIB_SRCDIR" + (string-append (getcwd) "/gnulib/src/gnulib")))) + (add-after 'copy-gnulib-sources 'update-bootstrap-script + (lambda _ + (copy-file "gnulib/src/gnulib/build-aux/bootstrap" + "bootstrap"))) + (add-after 'unpack 'patch-configure.ac + (lambda _ + (substitute* "configure.ac" + ;; The gnulib-provided git-version-gen script has a plain + ;; shebang of #!/bin/sh; avoid using it. + (("build-aux/git-version-gen" all) + (string-append "sh " all)))))))))) + (if (target-hurd64?) + (substitute-keyword-arguments arguments + ((#:configure-flags flags '()) + #~(list "--disable-threads" + "gl_cv_func_working_mktime=yes"))) + arguments))) (native-inputs (list autoconf automake bison ed)) (properties '())))) -- 2.46.0