From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 09 03:29:30 2024 Received: (at submit) by debbugs.gnu.org; 9 Mar 2024 08:29:30 +0000 Received: from localhost ([127.0.0.1]:60502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ris59-0002sh-AE for submit@debbugs.gnu.org; Sat, 09 Mar 2024 03:29:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:50272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ris55-0002sX-6a for submit@debbugs.gnu.org; Sat, 09 Mar 2024 03:29:26 -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 1ris4W-0005fl-Ki for guix-patches@gnu.org; Sat, 09 Mar 2024 03:28:48 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1ris4Q-0005N0-O5 for guix-patches@gnu.org; Sat, 09 Mar 2024 03:28:48 -0500 Received: from m.taildaf0f.ts.net (unknown [183.247.5.134]) by APP-05 (Coremail) with SMTP id zQCowAD3_6v2G+xlRacVBQ--.7422S2; Sat, 09 Mar 2024 16:21:11 +0800 (CST) From: Zheng Junjie To: guix-patches@gnu.org Subject: [PATCH] gnu: ruby-x25519: Fix build on non x86_64. Date: Sat, 9 Mar 2024 16:21:07 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAD3_6v2G+xlRacVBQ--.7422S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYh7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAS0I0E0xvYzxvE52x082IY 62kv0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7 IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4U M4x0Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMx C20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAF wI0_Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20x vE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v2 0xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxV WUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.134] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit 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/patches/ruby-x25519-automatic-fallback-non-x86_64.patch: New patch. * gnu/packages/ruby.scm(ruby-x25519)[source]: Use it. * gnu/local.mk(dist_patch_DATA): Regist it. Change-Id: If9c3b8dd8d818094f4cc5392bd5717f1430c369a --- gnu/local.mk | 1 + ...x25519-automatic-fallback-non-x86_64.patch | 45 +++++++++++++++++++ gnu/packages/ruby.scm | 7 ++- 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch diff --git a/gnu/local.mk b/gnu/local.mk index e5d1700077..1e21ab43f1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1989,6 +1989,7 @@ dist_patch_DATA = \ %D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \ %D%/packages/patches/rottlog-direntry.patch \ + %D%/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch \ %D%/packages/patches/ruby-hiredis-use-system-hiredis.patch \ %D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \ %D%/packages/patches/ruby-anystyle-data-immutable-install.patch \ diff --git a/gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch b/gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch new file mode 100644 index 0000000000..cd501bb343 --- /dev/null +++ b/gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch @@ -0,0 +1,45 @@ +from https://patch-diff.githubusercontent.com/raw/RubyCrypto/x25519/pull/36.patch + +From 5886507e08488c0ed116b1979a073b78b9495683 Mon Sep 17 00:00:00 2001 +From: Eric Long +Date: Sat, 15 Apr 2023 02:58:26 +0800 +Subject: [PATCH] Add automatic fallback for non-x86_64 targets + +--- + Rakefile | 2 +- + ext/x25519_precomputed/extconf.rb | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Rakefile b/Rakefile +index 535697c..6e4f4d3 100644 +--- a/Rakefile ++++ b/Rakefile +@@ -7,7 +7,7 @@ CLEAN.include("**/*.o", "**/*.so", "**/*.bundle", "pkg", "tmp") + + require "rake/extensiontask" + %w[precomputed ref10].each do |provider| +- next if provider == "precomputed" && RUBY_PLATFORM =~ /arm64-darwin/ ++ next if provider == "precomputed" && RUBY_PLATFORM !~ /x86_64|x64/ + + Rake::ExtensionTask.new("x25519_#{provider}") do |ext| + ext.ext_dir = "ext/x25519_#{provider}" +diff --git a/ext/x25519_precomputed/extconf.rb b/ext/x25519_precomputed/extconf.rb +index 7f2ba4d..b049f98 100644 +--- a/ext/x25519_precomputed/extconf.rb ++++ b/ext/x25519_precomputed/extconf.rb +@@ -4,12 +4,12 @@ + + require "mkmf" + +-if RUBY_PLATFORM =~ /arm64-darwin|aarch64-linux/ +- File.write("Makefile", "install clean: ;") +-else ++if RUBY_PLATFORM =~ /x86_64|x64/ + $CFLAGS << " -Wall -O3 -pedantic -std=c99 -mbmi -mbmi2 -march=haswell" + + create_makefile "x25519_precomputed" ++else ++ File.write("Makefile", "install clean: ;") + end + + # rubocop:enable Style/GlobalVars diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e6d51b94e2..9a28ecf9f5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro ;;; Copyright © 2023 Janneke Nieuwenhuizen -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023, 2024 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. @@ -3258,7 +3258,10 @@ (define-public ruby-x25519 (file-name (git-file-name name version)) (sha256 (base32 - "1g0311ly32f6hfn4q5fvkbjbl2bhv1l9fx6s0kglxfsrwq51926y")))) + "1g0311ly32f6hfn4q5fvkbjbl2bhv1l9fx6s0kglxfsrwq51926y")) + (patches + (search-patches + "ruby-x25519-automatic-fallback-non-x86_64.patch")))) (build-system ruby-build-system) (arguments (list #:test-target "spec" base-commit: a10cce5246e333be52acd7d334f59228895db89a prerequisite-patch-id: 5a904c413bc4e5484fed86ec8a7862b20ef3156e -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Mar 12 07:56:11 2024 Received: (at 69670-done) by debbugs.gnu.org; 12 Mar 2024 11:56:11 +0000 Received: from localhost ([127.0.0.1]:41961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk0jr-0003LP-4F for submit@debbugs.gnu.org; Tue, 12 Mar 2024 07:56:11 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:55354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk0jp-0003L2-6O for 69670-done@debbugs.gnu.org; Tue, 12 Mar 2024 07:56:09 -0400 Received: by mail-lf1-f41.google.com with SMTP id 2adb3069b0e04-513382f40e9so6418025e87.2 for <69670-done@debbugs.gnu.org>; Tue, 12 Mar 2024 04:55:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710244469; x=1710849269; darn=debbugs.gnu.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to :cc:subject:date:message-id:reply-to; bh=ubLNFxzISzPL+2UyDvgtcDnFgjNc7d/h5YJi5QkGERU=; b=aGY7wD2hGSfZPzvPPou+xXAX0KoVVJwIopXdG/DuAfzggJC/iGT7hLQrSVR1BF/Lje TI3RnzROVQIAHLfp7disMy1eAQ9qJfQB919BtEj7nss5Ww6Wte9QF9OwHMT8LSqX5xFF kztEvo/h0svhJv2C3zclr0dQM/bXjHO4OwidFYh3TnfwuTLZUDNQGbLYc7CBzb7IfQWu YXqQLuDeGBuzve6N5DKzSNZncOVKwfGr8iuK6kZcs6+aTM+bC+16eQW0Iga0BwRzSEHW AWdQS6Tk+3tAyUdLGjaJN545It5SHN5VWLDigXdDMd2DpzVtmk0qSRBsYflGQtyXDEg1 Sq2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710244469; x=1710849269; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ubLNFxzISzPL+2UyDvgtcDnFgjNc7d/h5YJi5QkGERU=; b=LV4kX70NhYLBHidlOdEF4iMqLofC5ZcbrDnRwRCiCR1rV4gdwVRKTwuoeYIhdbcpxJ tUxJNW82zDoaE2sb0c057F4tFv7LPzFIHZdZx3j2lfF/2wSYKKzXElg5haSh8O8Fp9th N1otKWyb/uvbSs0v8CvlgGAwfQmn6yV4gI9i7jUblhUtwynpwGV2EqwwqkdKdPFGZkUR 3Hntmmh8WmkS+7vXCBKx931HfUcD1loy6dZo4HIqN+rLG6Qc3EnLusjOxIH76SJUkXQ0 WIvICLggO0HSHOTNdCAnfOE+zJhWwcYw2iZ2kCNrlebcnPORZp+RX1Vn/BwGY/3qX94r nOUQ== X-Gm-Message-State: AOJu0YyMdsO/UX7H7rm0d2y+1C6jCVrNukCAWl9kFk5lnu5m3JDr5fQZ dxlWrHtf6rtt3gzps+2YztEw4opayXyAxR+p43KjaOrRTSN08Ohe X-Google-Smtp-Source: AGHT+IFHxhxKqsCJGTvabQsKb8Kyx77aoVixFojGTiBgLFmLTzW0iSSsDyElND8wCsBV26GVtqN/kQ== X-Received: by 2002:a19:f716:0:b0:513:c4b8:388b with SMTP id z22-20020a19f716000000b00513c4b8388bmr251064lfe.27.1710244468172; Tue, 12 Mar 2024 04:54:28 -0700 (PDT) Received: from localhost ([141.226.12.177]) by smtp.gmail.com with ESMTPSA id fj3-20020a05600c0c8300b004131f5966f5sm11870416wmb.42.2024.03.12.04.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Mar 2024 04:54:27 -0700 (PDT) Date: Tue, 12 Mar 2024 13:54:26 +0200 From: Efraim Flashner To: Zheng Junjie Subject: Re: [bug#69670] [PATCH] gnu: ruby-x25519: Fix build on non x86_64. Message-ID: Mail-Followup-To: Efraim Flashner , Zheng Junjie , 69670-done@debbugs.gnu.org, Christopher Baines References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="/9EKoLBPj9W+E95c" Content-Disposition: inline In-Reply-To: X-PGP-Key-ID: 0x41AAE7DCCA3D8351 X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: 69670-done Cc: Christopher Baines , 69670-done@debbugs.gnu.org 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: -0.8 (/) --/9EKoLBPj9W+E95c Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Looks good to me. Thanks! Patch pushed. --=20 Efraim Flashner =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 = =D7=9D=D7=99=D7=A8=D7=A4=D7=90 GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted --/9EKoLBPj9W+E95c Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmXwQnIACgkQQarn3Mo9 g1GdRxAAwn8lRP3o13t91OxmmzyA/yvnReVuZLpgoBzbHtrqCZrYLA65lkjZW9H2 SLkb1KvNdSc5CjjOrrok5YN/aWTToPQXP3/uMWkAhnFCOHVmZy1uR2DcFebYVqk7 W9NTCT2/desba53H4282hkvLCTkj5gbHqM/8zgu7RntMbjdka/gJoHIho5WOXlTV JxMVVbGlNNT5AR3mfQP0FhA0MEKz+GIHwPcwYD3Q8NsIzoWKNOhgVbGXxnLnxaFM ESW2dNp51Mpt+hGiOI5HCVjoLj1zEzZ8hlEHyJAk8b85bN0vFHqfhZXNlA59f/kn wJjM0kldhbEcSB2CnXknNjbyx20LwxbTKUq1RMIH8Sw/DkzcIRWkjfTvV+Eac0ux wQju1k2TLggOGW6cP76ZZShqRIGucidew74Stp5lPVx0RjhVZ4r+aoOW17Bp3i+z A524EMz+WSQDFTAkiXfOjvfAQBYyrB64fP9b/1cDHsB7EtxzevqWoWgh0dv0ovV3 ZZZVW7BkNSWUEB9eGGcYZ5Oznijm1NRsGJBaxiyd2G08H5MaivZwiddfxt/KhQEL U0tvd4DA5GaxM+titirxCAoAIW5/qaI3aN0oatTD84PAYHZY+3Z+00OulHRpu1UO PCYBy0QvBRIXqr1rXW7lkO9datMKanSS2eS7jj8t/eCN5LeBRt4= =tOsw -----END PGP SIGNATURE----- --/9EKoLBPj9W+E95c-- From unknown Sat Aug 16 21:21:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 10 Apr 2024 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator