From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id CCweA/WktmTy1AAASxT56A (envelope-from ) for ; Tue, 18 Jul 2023 16:43:01 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id WAchAvWktmSIewEAG6o9tA (envelope-from ) for ; Tue, 18 Jul 2023 16:43:01 +0200 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 B67B034049 for ; Tue, 18 Jul 2023 16:43:00 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Tsb73C4X; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1689691380; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=23D+OKs7X1wmz/a8kv8x/F6yjzYTPLZp4Xm6y4Mf5YE=; b=EKGbn2NHtn9Ad72TauuBGHx0tHfjrzKSPXgfwiJsiFCSZGBg9ZkkWGSULy8A21rshAI6pa ZhCDUsgyBDpXHVLpBBJL3zVws+MlO2ut+6O2vszZrCldeM1NrK1YD9MZxpqeWB3FVgCXO2 mGjGmrr8JfO2KNydtWDvyuCrMJ7+/M99zcHUCOoAn+7604BW3Weo4kxm91L5N2DEVLcJRx vXxtf+NRGbcF0rpABrpeg5TXZ/ofANp8xyzyYd7SzOj3yImyQSYH6qK+qp6RIPrvtu+jpK GmmnZHhGVRXmdvlpzZ4J7r5qO0yRI/wNytwY2vYrjC4RIjGxTKl9SbSzv5BkQw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1689691380; a=rsa-sha256; cv=none; b=oVH29Hc/WENmJrveAwPJGCEH3TGnNhqTR4UTWk4m7mtPPnUsAj0GC/YHaXkzco5ujWRZw0 YLCl3uvzbAgBqkcqx3p9QgV+7VDYvnh9urHbdY/CXHY/MJq6HoimWxIl+TtE5qp0zeCGkF 2melVPfClsqnzSXOT6Qqodo8y3o/CZAezlGE7MEoRQmpUUkC93Nq+jKvh2dYL7Wda46aGI PVjz1zSwbY6u7/GB92mfvPOMEjKjOyxH0LEPehqeO1hrjbyPnBJQHcqRbZlv3VMF0v0L+8 YTqCnRrSesQIoRRTKRAfbPK/f/mcb0mVmarpqLgiV9KqWomuxWkYxi6G1fXEGw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Tsb73C4X; 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"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLlu0-0007oq-UC; Tue, 18 Jul 2023 10:42: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 1qLltz-0007kG-8F for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:11 -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 1qLltz-0000wf-0H for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLlty-0006fM-Sk for guix-patches@gnu.org; Tue, 18 Jul 2023 10:42:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 27/43] gnu: openssl-1.1: Fix shared build for the Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:42:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64711@debbugs.gnu.org Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969131725444 (code B ref 64711); Tue, 18 Jul 2023 14:42:10 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:41:57 +0000 Received: from localhost ([127.0.0.1]:53820 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLltk-0006cK-Jb for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56990) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLlti-0006bz-8u for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:41:54 -0400 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 1qLltd-0000qX-1r; Tue, 18 Jul 2023 10:41:49 -0400 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=23D+OKs7X1wmz/a8kv8x/F6yjzYTPLZp4Xm6y4Mf5YE=; b=Tsb73C4XvPPlJI4U78FX 7V7aAzn4Xq2/xO21cEKQL3OX2GhBRATLmtxbNE2dGYfBZgytaVXswi5VbfTXYnV0VHdnRmiSpb1Vk VWfuyuTBIsgMDE55nR2q1543nw1qmyS6aLmcmLFMURoIqejTKFXmAZO72eHKK3CeWfnwUqZrCD4RR hYjf6Cr6AI7UX4yN4efu8rGvFZfYEYlcbmpptLUBiVh01sDTvNRvV4F3T48cCr4Q+ftw72dVk0WsU HLsX15PdC70FBoEtG8M+c/iacjsd1Ty23aveh71lAx//pWbQ+QrW9b4ZmeROMtzM9ASNbr8jdy82i 9qn3vRSlww8h2A==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLltV-0004hp-L5; Tue, 18 Jul 2023 10:41:48 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 16:40:20 +0200 Message-Id: <0645e6a1b8e60469607b9b041de89203ab860a26.1689690897.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -3.84 X-Spam-Score: -3.84 X-Migadu-Queue-Id: B67B034049 X-TUID: ptY0WTHe2oRS * gnu/packages/tls.scm (openssl-1.1)[arguments]: When building for the Hurd, add phase 'patch-configure'. (openssl)[arguments]: And delete it again. --- gnu/packages/tls.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e8ed0d61a4..021c125983 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -470,6 +470,13 @@ (define-public openssl-1.1 #$(target->openssl-target (%current-target-system)))))) #~()) + #$@(if (target-hurd?) + #~((add-after 'unpack 'patch-configure + (lambda _ + (substitute* "config" + (("case \"\\$GUESSOS\" in.*" all) + (string-append all "hurd-x86*) OUT=hurd-x86;;\n")))))) + #~()) (replace 'configure (lambda* (#:key configure-flags #:allow-other-keys) ;; It's not a shebang so patch-source-shebangs misses it. @@ -585,7 +592,10 @@ (define-public openssl-3.0 (lambda* (#:key native-inputs inputs #:allow-other-keys) (setenv "HASHBANGPERL" (search-input-file (or native-inputs inputs) - "/bin/perl")))))) + "/bin/perl")))) + #$@(if (target-hurd?) + #~((delete 'patch-configure)) + #~()))) ((#:configure-flags flags #~'()) (if (target-hurd? (%current-system)) #~(append -- 2.40.1