From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id KK45BGI4aGdIPQAAe85BDQ:P1 (envelope-from ) for ; Sun, 22 Dec 2024 16:03:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id KK45BGI4aGdIPQAAe85BDQ (envelope-from ) for ; Sun, 22 Dec 2024 17:03:46 +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=clfTOsqz; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=VJeyAnSU; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1734883425; 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=ICJoll54w5e3o3lR26iY+GIpre/ZrPrqWAf6UySuYug=; b=umtTLCFGmbBOYAI/q2OGiu10LbgJDz51Zg+BVX+hz7mMp573uEcqwDMqt/IV+Y/qRDzCTK YKI18OjvwXe500AU2DVDLYZOMCEsMX54Q69z1AGtZ7Yw9FEK5tlbBhDnlQwUjBzIYetG6a PhjLCpyBioFxtAdaEmyO4Yox3pn80AWfd0Tfsj2Q3oTVtpY2fPgysQxt0sDZNs98lbLJKu ArSDDS+B5m9Bc2kolDe2vyB97bm3vO/LkWY+PDK/wsZZmX+zAzpYcnSajJEK/Uqc415Hgo 8JZQDZZ6knI15xKKCsLrk3MIBlEuCarFEvuL4ivEaPjDFeULp/JxnJWUYqRPOw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=clfTOsqz; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=VJeyAnSU; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1734883425; a=rsa-sha256; cv=none; b=laR9xnzGhrqL/X+X/evi7rqODcXvTB004Ub1hM4DnvESIOKt/4tqF5b1yYxJK0p19KZJse bC7eutDaxsEf1mBej6S5AcM65NRMyCgF1OSZ2m4vXMwhzMM5ANWUq/cx6aqLwtMEeK5E7G 6Xl5RXS7zoHnvw6sm3pug8JJVOYYa6S8tnT/C0neRDwrgetSN+FILO6gE+Ru8iLJa12ptR jd7LmMmCltVvdmf0K459luxC/4dkYSUDgAgEX0+S3Asztvhq/GFhZuq4DXK7sTK90BzE6o VEvw9xHHO1f/Rt1CDbV4MvUGxYzLhZDPEr7JgIOHq/skkawFRMRlhRcqzzyBXw== 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 94B9C8062A for ; Sun, 22 Dec 2024 17:03:45 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tPOQ5-0005QN-1g; Sun, 22 Dec 2024 11:03:05 -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 1tPOQ3-0005PX-FK for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:03 -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 1tPOQ2-0008V0-WD for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:03 -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=ICJoll54w5e3o3lR26iY+GIpre/ZrPrqWAf6UySuYug=; b=clfTOsqzbGcoYh34xoCkZbORU2wiLUaLThegtONM8ySRHsgPxBg5+2QFLX21oMDzlJcz5Xju6o1BoNxjreromZepeyoZ69w6Dawb8TjbjjQd/pYFRbOb1vFrmdNxPunrZptmmTznSAkxcLgF9JXmaIdNhrNlYWzy6MYB1859q7itMDkTuUvBnYph9hUBvfgENbyqSN0LKF8dJTlPe/n9kpRtJ2HDWkHumJY+g1tNkEBgOmdKzfQQ3WN+TL2nYeqRACGIRbcrm6lhksZuhS0sOvzZTHwZsLuDe/hBObEuykS+kUZN4BTxUKIPRqp5bZS4vnxAY7y2qcAyQKt/Hvg6LQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tPOQ2-0003eK-Qb for guix-patches@gnu.org; Sun, 22 Dec 2024 11:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75026] [PATCH core-updates 3/7] gnu: gnutls: Streamline mips64el conditionals. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Dec 2024 16:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75026 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75026@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 75026-submit@debbugs.gnu.org id=B75026.173488336413943 (code B ref 75026); Sun, 22 Dec 2024 16:03:02 +0000 Received: (at 75026) by debbugs.gnu.org; 22 Dec 2024 16:02:44 +0000 Received: from localhost ([127.0.0.1]:51573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPOPh-0003ca-R9 for submit@debbugs.gnu.org; Sun, 22 Dec 2024 11:02:44 -0500 Received: from mail-pl1-f172.google.com ([209.85.214.172]:48369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tPOPf-0003c4-1D for 75026@debbugs.gnu.org; Sun, 22 Dec 2024 11:02:39 -0500 Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-216281bc30fso36512595ad.0 for <75026@debbugs.gnu.org>; Sun, 22 Dec 2024 08:02:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734883293; x=1735488093; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ICJoll54w5e3o3lR26iY+GIpre/ZrPrqWAf6UySuYug=; b=VJeyAnSUsJfisyuCIQqYt8H+tgPmVe007Id9N6REP4aW6k89KjxjBOhxkL/qASN9ob FL/sjBcBfnyw6K2sIFSyr/lp8SJAlQ4075FCEkmbBQ9+0y/i3tS5xIikPfL5N7HrjZI8 el3UqqBSBAL5Fr9lqYK69inN5Gr3df/CALEWcAtLBIOCmVf9n3FTO9GYOob5tkcNq4QT jAa8LdHFs0v8WCXHiw3TEkZDpxATJI0l0AMqfRzPfdjdYc/ckMmAOJ7EEg9XPnr7ozym /aJq9cH4EordJw/rFn4t4YlhC2OXSzCWdQDnfpW1DmCIMv1bKTxdPLrP5awjeV3p9O3I O2AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734883293; x=1735488093; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ICJoll54w5e3o3lR26iY+GIpre/ZrPrqWAf6UySuYug=; b=TML7IhQJQ//Ea8X+EYXq/qQIzz4tjDlTsKj3lq3ecCCldW5zJ7lpzd3dHxsBV+/ZUj Yow9wpz2fkK3K/YIY4V7x2hw1MtBUesExpFWwK+DH+9zWG8HWHbp4AxELo790ZGa9z/h 2+fdwtm7tWWdm+dZXp85PQnwt8l0FLC4oZdJ3rbyYm+1+igRqCCNInqx1vaPXxzWqN7h s6lbY6Mm2rXJHbAtmj4M4svaaRQ4VsDkOQKKxx/tfjD1CNG/m7tti8ohShBQ5bSwBBUY hoRBxC0PIV+ba+Pi0CB/CUN+BKx3tFR8Ye12KnxBGXiYzoarF8Pa+PYNbVPnzIvDnmu/ v9bw== X-Gm-Message-State: AOJu0YyEUyBR4EduDtbevgBAbmMCkQoyGDtH6sgakYlI9JZSef3Ekav8 L1zOFGIxTn/2wQYvKfJH33AaMxTSG7yrB/5ijaXmtf6fgFhQDUBLYwpkkA== X-Gm-Gg: ASbGncvIfv633Zwh+URC5w1L6q/eszEtsOPUxUJpoOZ7m738C7XgJoV111XMd2B4K4n jEW9sbbEwMlHD4CEnDXS89OGpzbF9yaiPiDMpg8CspTy8GfBkDJ0NVxf/Ks95eFTEI+PE5F9Drp ukd4YmFGbHYgdlD6unFmHJ4HBLUL9S3cqBnfZm+n8jEXW2Zl2UnDK2XzkhyDj/NnflhpA1ePuoH /s/BOKQkIn2JkQrye9cniKZ1zlgA3wgBGtnprjtJhcQQasGo8/sLxYAIZp4nC1rENbPtUEewL0= X-Google-Smtp-Source: AGHT+IH3ELQG4PNFHMH9bgWPN/gT3k8PkkOqY7ATQNlu4MejtZuyO5b5kHYtNazE5qzIa9mD/BiuIw== X-Received: by 2002:a17:903:1105:b0:215:a3fb:b4d6 with SMTP id d9443c01a7336-219e6e8c5a0mr147858705ad.8.1734883292239; Sun, 22 Dec 2024 08:01:32 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f68e4sm58423495ad.211.2024.12.22.08.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Dec 2024 08:01:30 -0800 (PST) From: Maxim Cournoyer Date: Mon, 23 Dec 2024 01:01:01 +0900 Message-ID: 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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -4.38 X-Spam-Score: -4.38 X-Migadu-Queue-Id: 94B9C8062A X-TUID: pgxWKcqowEif * gnu/packages/tls.scm (gnutls) [arguments]: Use target-mips64el? procedure in #:configure-flags. [propagated-inputs]: Likewise. Change-Id: Ia4b603ef57cebe78df1d3e40222fe9c49d9ee8cc --- gnu/packages/tls.scm | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c0efb66d96..90d6ad5c95 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -232,15 +232,12 @@ (define-public gnutls ;; fallback, and users have to configure each program ;; independently. This seems suboptimal. "--with-default-trust-store-dir=/etc/ssl/certs" - - (let ((system #$(or (%current-target-system) - (%current-system)))) - (if (string-prefix? "mips64el" system) - (list - ;; FIXME: Temporarily disable p11-kit support since it is - ;; not working on mips64el. - "--without-p11-kit") - '()))) + (if #$(target-mips64el?) + (list + ;; FIXME: Temporarily disable p11-kit support since it is + ;; not working on mips64el. + "--without-p11-kit") + '())) #:make-flags #~(list (string-append "XFAIL_TESTS=" @@ -287,11 +284,9 @@ (define-public gnutls (propagated-inputs ;; These are all in the 'Requires.private' field of gnutls.pc. (append (list libtasn1 libidn2 nettle zlib) - (let ((system (or (%current-target-system) - (%current-system)))) - (if (string-prefix? "mips64el" system) - '() - (list p11-kit))))) + (if (target-mips64el?) + '() + (list p11-kit)))) (home-page "https://gnutls.org") (synopsis "Transport layer security library") (description -- 2.46.0