From unknown Fri Aug 15 20:28:35 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#77071] [PATCH] gnu: ogre-next: Fix build on riscv64. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Mar 2025 14:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77071 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77071@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17422232911651 (code B ref -1); Mon, 17 Mar 2025 14:55:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Mar 2025 14:54:51 +0000 Received: from localhost ([127.0.0.1]:59792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuBrb-0000QW-IL for submit@debbugs.gnu.org; Mon, 17 Mar 2025 10:54:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39572) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tuBrX-0000PS-OC for submit@debbugs.gnu.org; Mon, 17 Mar 2025 10:54:45 -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 1tuBrR-0006IL-FB for guix-patches@gnu.org; Mon, 17 Mar 2025 10:54:37 -0400 Received: from mail.z572.online ([88.99.160.180]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuBrK-0006Ck-EP for guix-patches@gnu.org; Mon, 17 Mar 2025 10:54:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1742223614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkFCEra9RdZ1avMLsRU+MyNjVwVIaXF5EMK6dIRv87M=; b=ZhOXuTQ1AUBGsCC+zc4VBmFiLy1E0TiRloBqbIbnCpXUYp0pRcXFM7RWBTx+hSNdi7+KhT irKlp32Ih12X1VdUBqY2N0Ac3IsRsMeGiceTF7XsOcCc3grOebGYgyUBHSiClHTh7sHONZ HWVh/OfwfxCJup6x+RsBXhh68EKyh54= Received: from m.tailaa68d.ts.net (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 099c4e4b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 17 Mar 2025 15:00:12 +0000 (UTC) From: Zheng Junjie Date: Mon, 17 Mar 2025 22:54:07 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=88.99.160.180; envelope-from=z572@z572.online; helo=mail.z572.online X-Spam_score_int: 19 X-Spam_score: 1.9 X-Spam_bar: + X-Spam_report: (1.9 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.999, PDS_OTHER_BAD_TLD=1.476, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 4.9 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. [source]: Add ogre-next-add-riscv64-support.patch. [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2=OFF and -DOGR [...] Content analysis details: (4.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.5 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: z572.online (online)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 2.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 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: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. [source]: Add ogre-next-add-riscv64-support.patch. [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2=OFF and -DOGR [...] Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.5 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: z572.online (online)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. [source]: Add ogre-next-add-riscv64-support.patch. [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2=OFF and -DOGRE_SIMD_NEON=OFF. * gnu/packages/patches/ogre-next-add-riscv64-support.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I77279f3f5ed238f8b6526b5eceea5751f86ea6e1 --- gnu/local.mk | 1 + gnu/packages/graphics.scm | 12 ++++++-- .../ogre-next-add-riscv64-support.patch | 28 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/ogre-next-add-riscv64-support.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01d13a11ae8..c9533507eac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1918,6 +1918,7 @@ dist_patch_DATA = \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/obs-modules-location.patch \ %D%/packages/patches/ocaml-multiple-definitions.patch \ + %D%/packages/patches/ogre-next-add-riscv64-support.patch \ %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9d7ec2933a9..82057adf680 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2021, 2022 Vinicius Monego ;;; Copyright © 2022 Michael Rohleder ;;; Copyright © 2022, 2023, 2024 John Kehayias -;;; Copyright © 2022, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022, 2024, 2025 Zheng Junjie ;;; Copyright © 2022 Tobias Kortkamp ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 dan @@ -1351,6 +1351,7 @@ (define-public ogre-next (url "https://github.com/OGRECave/ogre-next") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "ogre-next-add-riscv64-support.patch")) (sha256 (base32 "1yrlg3s654xbp95208h9a2b8jcwdk69r6sjvll0aiyvxm4c056cw")))) @@ -1358,7 +1359,14 @@ (define-public ogre-next ((#:tests? _ #f) ;; The test suite is currently disabled by the build system ;; (see: https://github.com/OGRECave/ogre-next/issues/466). - #f))) + #f) + ((#:configure-flags flags #~(list)) + (if (target-riscv64?) + #~(cons* + "-DOGRE_SIMD_SSE2=OFF" + "-DOGRE_SIMD_NEON=OFF" + #$flags) + flags)))) (inputs (modify-inputs (package-inputs ogre) (append rapidjson))))) diff --git a/gnu/packages/patches/ogre-next-add-riscv64-support.patch b/gnu/packages/patches/ogre-next-add-riscv64-support.patch new file mode 100644 index 00000000000..37251eaaf20 --- /dev/null +++ b/gnu/packages/patches/ogre-next-add-riscv64-support.patch @@ -0,0 +1,28 @@ +from https://github.com/OGRECave/ogre-next/pull/478 + +From 12081a8f1a0e676ac618dd7c4c1d2e8390c07278 Mon Sep 17 00:00:00 2001 +From: Eric Long +Date: Mon, 18 Nov 2024 21:56:13 +0800 +Subject: [PATCH] Add riscv64 to 64-bit architectures + +--- + OgreMain/include/OgrePlatform.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h +index f9f7a12e46..a977aa2958 100644 +--- a/OgreMain/include/OgrePlatform.h ++++ b/OgreMain/include/OgrePlatform.h +@@ -81,7 +81,8 @@ THE SOFTWARE. + #if defined( __x86_64__ ) || defined( _M_X64 ) || defined( _M_X64 ) || defined( _M_AMD64 ) || \ + defined( __ppc64__ ) || defined( __PPC64__ ) || defined( __arm64__ ) || defined( __aarch64__ ) || \ + defined( _M_ARM64 ) || defined( __mips64 ) || defined( __mips64_ ) || defined( __alpha__ ) || \ +- defined( __ia64__ ) || defined( __e2k__ ) || defined( __s390__ ) || defined( __s390x__ ) ++ defined( __ia64__ ) || defined( __e2k__ ) || defined( __s390__ ) || defined( __s390x__ ) || \ ++ (defined(__riscv) && __riscv_xlen == 64) + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64 + #else + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32 +-- +2.47.1 + base-commit: cb386c3c70212252ddcdb0bb9f6a8ecfd22378a6 -- 2.48.1 From unknown Fri Aug 15 20:28:35 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Zheng Junjie Subject: bug#77071: closed (Re: [bug#77071] [PATCH] gnu: ogre-next: Fix build on riscv64.) Message-ID: References: <87msd3w65y.fsf@z572.online> X-Gnu-PR-Message: they-closed 77071 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 77071@debbugs.gnu.org Date: Sun, 30 Mar 2025 03:28:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1743305283-21651-1" This is a multi-part message in MIME format... ------------=_1743305283-21651-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #77071: [PATCH] gnu: ogre-next: Fix build on riscv64. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 77071@debbugs.gnu.org. --=20 77071: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D77071 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1743305283-21651-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 77071-done) by debbugs.gnu.org; 30 Mar 2025 03:27:36 +0000 Received: from localhost ([127.0.0.1]:33844 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tyjKf-0005bj-Ii for submit@debbugs.gnu.org; Sat, 29 Mar 2025 23:27:35 -0400 Received: from mail.z572.online ([88.99.160.180]:42710) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tyjJM-0005Yr-9D for 77071-done@debbugs.gnu.org; Sat, 29 Mar 2025 23:26:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1743305539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3T5kalB0hCnT9ryir+qXFQv7sfbTI6pMTyiVK/kDDh8=; b=drzVbrARNTaq2/DfELLF4GgoJWaRie7P2a3r1EoL/Wm7UciC6flnNhWkM9dUj06ptOYEXd DDh2j7BONK8gYSTxkvBCCysrptCDHVO5NWidAq+Zxw5urU8yAu5B2qBXxB4SU41m5C0+OW GsK+jpEhW8pI7GhOg8Z47guHe4GkP1c= Received: from m (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 0843a686 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for <77071-done@debbugs.gnu.org>; Sun, 30 Mar 2025 03:32:18 +0000 (UTC) From: Z572 To: 77071-done@debbugs.gnu.org Subject: Re: [bug#77071] [PATCH] gnu: ogre-next: Fix build on riscv64. In-Reply-To: (Zheng Junjie's message of "Mon, 17 Mar 2025 22:54:07 +0800") References: User-Agent: mu4e 1.12.9; emacs 30.0.92 Date: Sun, 30 Mar 2025 11:26:01 +0800 Message-ID: <87msd3w65y.fsf@z572.online> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Zheng Junjie writes: > * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. > [source]: Add ogre-next-add-riscv64-support.patch. > [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2=OFF > a [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [88.99.160.180 listed in bl.score.senderscore.com] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: z572.online (online)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [88.99.160.180 listed in sa-accredit.habeas.com] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: 77071-done 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.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Zheng Junjie writes: > * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. > [source]: Add ogre-next-add-riscv64-support.patch. > [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2=OFF > a [...] Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [88.99.160.180 listed in bl.score.senderscore.com] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: z572.online (online)] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [88.99.160.180 listed in sa-trusted.bondedsender.org] 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Zheng Junjie writes: > * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. > [source]: Add ogre-next-add-riscv64-support.patch. > [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2= =3DOFF > and -DOGRE_SIMD_NEON=3DOFF. > * gnu/packages/patches/ogre-next-add-riscv64-support.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > > Change-Id: I77279f3f5ed238f8b6526b5eceea5751f86ea6e1 > --- > gnu/local.mk | 1 + > gnu/packages/graphics.scm | 12 ++++++-- > .../ogre-next-add-riscv64-support.patch | 28 +++++++++++++++++++ > 3 files changed, 39 insertions(+), 2 deletions(-) > create mode 100644 gnu/packages/patches/ogre-next-add-riscv64-support.pa= tch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 01d13a11ae8..c9533507eac 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1918,6 +1918,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/nyacc-binary-literals.patch \ > %D%/packages/patches/obs-modules-location.patch \ > %D%/packages/patches/ocaml-multiple-definitions.patch \ > + %D%/packages/patches/ogre-next-add-riscv64-support.patch \ > %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patc= h \ > %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patc= h \ > %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ > diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm > index 9d7ec2933a9..82057adf680 100644 > --- a/gnu/packages/graphics.scm > +++ b/gnu/packages/graphics.scm > @@ -29,7 +29,7 @@ > ;;; Copyright =C2=A9 2021, 2022 Vinicius Monego > ;;; Copyright =C2=A9 2022 Michael Rohleder > ;;; Copyright =C2=A9 2022, 2023, 2024 John Kehayias > -;;; Copyright =C2=A9 2022, 2024 Zheng Junjie <873216071@qq.com> > +;;; Copyright =C2=A9 2022, 2024, 2025 Zheng Junjie > ;;; Copyright =C2=A9 2022 Tobias Kortkamp > ;;; Copyright =C2=A9 2022 Paul A. Patience > ;;; Copyright =C2=A9 2022 dan > @@ -1351,6 +1351,7 @@ (define-public ogre-next > (url "https://github.com/OGRECave/ogre-next") > (commit (string-append "v" version)))) > (file-name (git-file-name name version)) > + (patches (search-patches "ogre-next-add-riscv64-support.pa= tch")) > (sha256 > (base32 > "1yrlg3s654xbp95208h9a2b8jcwdk69r6sjvll0aiyvxm4c056cw"))= )) > @@ -1358,7 +1359,14 @@ (define-public ogre-next > ((#:tests? _ #f) > ;; The test suite is currently disabled by the build s= ystem > ;; (see: https://github.com/OGRECave/ogre-next/issues/= 466). > - #f))) > + #f) > + ((#:configure-flags flags #~(list)) > + (if (target-riscv64?) > + #~(cons* > + "-DOGRE_SIMD_SSE2=3DOFF" > + "-DOGRE_SIMD_NEON=3DOFF" > + #$flags) > + flags)))) > (inputs > (modify-inputs (package-inputs ogre) > (append rapidjson))))) > diff --git a/gnu/packages/patches/ogre-next-add-riscv64-support.patch b/g= nu/packages/patches/ogre-next-add-riscv64-support.patch > new file mode 100644 > index 00000000000..37251eaaf20 > --- /dev/null > +++ b/gnu/packages/patches/ogre-next-add-riscv64-support.patch > @@ -0,0 +1,28 @@ > +from https://github.com/OGRECave/ogre-next/pull/478 > + > +From 12081a8f1a0e676ac618dd7c4c1d2e8390c07278 Mon Sep 17 00:00:00 2001 > +From: Eric Long > +Date: Mon, 18 Nov 2024 21:56:13 +0800 > +Subject: [PATCH] Add riscv64 to 64-bit architectures > + > +--- > + OgreMain/include/OgrePlatform.h | 3 ++- > + 1 file changed, 2 insertions(+), 1 deletion(-) > + > +diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlat= form.h > +index f9f7a12e46..a977aa2958 100644 > +--- a/OgreMain/include/OgrePlatform.h > ++++ b/OgreMain/include/OgrePlatform.h > +@@ -81,7 +81,8 @@ THE SOFTWARE. > + #if defined( __x86_64__ ) || defined( _M_X64 ) || defined( _M_X64 ) || = defined( _M_AMD64 ) || \ > + defined( __ppc64__ ) || defined( __PPC64__ ) || defined( __arm64__ = ) || defined( __aarch64__ ) || \ > + defined( _M_ARM64 ) || defined( __mips64 ) || defined( __mips64_ ) = || defined( __alpha__ ) || \ > +- defined( __ia64__ ) || defined( __e2k__ ) || defined( __s390__ ) ||= defined( __s390x__ ) > ++ defined( __ia64__ ) || defined( __e2k__ ) || defined( __s390__ ) ||= defined( __s390x__ ) || \ > ++ (defined(__riscv) && __riscv_xlen =3D=3D 64) > + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64 > + #else > + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32 > +--=20 > +2.47.1 > + > > base-commit: cb386c3c70212252ddcdb0bb9f6a8ecfd22378a6 pushed, closing. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmfouckACgkQO1qpk+Gi 3/C+CA/+OiKecGVmaTQL6ePc8VsthhbPoHetal/SDWKcAKasksukZbLp49h5YQct KhhU4wVpC7QLr8GpIn+bziB5NRYsuTueDdslmUJRmnCWDzBHgunJrMa6fCDKdkLG ITQhBV2hUNjM7IDQAOFfg4EO3Xa/LFeptudFV+To3r+WJgAoL5AGEtcLpOmPJQwJ 9UDf8GNX5JLmSbKawsV1ZNTDdeomXy5UodalxF5K/8wnoxFmJ2lt6QALrZwndyHr cVaoAZHm1VEnkZvTJtbhjDIABHzosbbeHVkAK6GJGgSeaKjGeox02u7ExpaJQQjC jmBPQXZ+DsY+hM159GfTVju/CV5yDqBLZVtHDO1zUAmA48BSbJ39Arl4H0/YYOaJ QFIOzh23HaCbxp2M7A1dv5IRzVRXkAybxjqwFgKTM9wYcfbJJVUEtGSl/yo7mMGb 0v+v+9VgIjYoPhPNanpGgsqBAWi3wafTEBB7yLOi9JLvNFnn68RfpQRd+U30skYt Ns9i7UF1Dh3eTG3Gu4s5uYRpUsXc/eClLWnZxEoekmgPa2gosWwpxJoeeNlK6sRN Hg/Dpe+gACHb2GaTWAcgB1seDglNimRAb2bJ8P52b8yDNHLVBLH7HxHYZL7TIUt1 rMhiOK0ED21EGpy271f+HeSJU/eFmWqi3jXiFZmc7g6kMeRvcQE= =WfL6 -----END PGP SIGNATURE----- --=-=-=-- ------------=_1743305283-21651-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 17 Mar 2025 14:54:51 +0000 Received: from localhost ([127.0.0.1]:59792 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tuBrb-0000QW-IL for submit@debbugs.gnu.org; Mon, 17 Mar 2025 10:54:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:39572) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tuBrX-0000PS-OC for submit@debbugs.gnu.org; Mon, 17 Mar 2025 10:54:45 -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 1tuBrR-0006IL-FB for guix-patches@gnu.org; Mon, 17 Mar 2025 10:54:37 -0400 Received: from mail.z572.online ([88.99.160.180]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tuBrK-0006Ck-EP for guix-patches@gnu.org; Mon, 17 Mar 2025 10:54:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me; t=1742223614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkFCEra9RdZ1avMLsRU+MyNjVwVIaXF5EMK6dIRv87M=; b=ZhOXuTQ1AUBGsCC+zc4VBmFiLy1E0TiRloBqbIbnCpXUYp0pRcXFM7RWBTx+hSNdi7+KhT irKlp32Ih12X1VdUBqY2N0Ac3IsRsMeGiceTF7XsOcCc3grOebGYgyUBHSiClHTh7sHONZ HWVh/OfwfxCJup6x+RsBXhh68EKyh54= Received: from m.tailaa68d.ts.net (mail1.85362086.com [107.174.64.25]) by mail.z572.online (OpenSMTPD) with ESMTPSA id 099c4e4b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Mon, 17 Mar 2025 15:00:12 +0000 (UTC) From: Zheng Junjie To: guix-patches@gnu.org Subject: [PATCH] gnu: ogre-next: Fix build on riscv64. Date: Mon, 17 Mar 2025 22:54:07 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=88.99.160.180; envelope-from=z572@z572.online; helo=mail.z572.online X-Spam_score_int: 19 X-Spam_score: 1.9 X-Spam_bar: + X-Spam_report: (1.9 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.999, PDS_OTHER_BAD_TLD=1.476, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 4.9 (++++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. [source]: Add ogre-next-add-riscv64-support.patch. [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2=OFF and -DOGR [...] Content analysis details: (4.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.5 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: z572.online (online)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 2.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD 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: 1.9 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. [source]: Add ogre-next-add-riscv64-support.patch. [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2=OFF and -DOGR [...] Content analysis details: (1.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.5 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: z572.online (online)] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/graphics.scm (ogre-next): Fix build on riscv64. [source]: Add ogre-next-add-riscv64-support.patch. [argument]<#:configure-flags>: When target riscv64, Add -DOGRE_SIMD_SSE2=OFF and -DOGRE_SIMD_NEON=OFF. * gnu/packages/patches/ogre-next-add-riscv64-support.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I77279f3f5ed238f8b6526b5eceea5751f86ea6e1 --- gnu/local.mk | 1 + gnu/packages/graphics.scm | 12 ++++++-- .../ogre-next-add-riscv64-support.patch | 28 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/ogre-next-add-riscv64-support.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01d13a11ae8..c9533507eac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1918,6 +1918,7 @@ dist_patch_DATA = \ %D%/packages/patches/nyacc-binary-literals.patch \ %D%/packages/patches/obs-modules-location.patch \ %D%/packages/patches/ocaml-multiple-definitions.patch \ + %D%/packages/patches/ogre-next-add-riscv64-support.patch \ %D%/packages/patches/ocaml-4.07-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-dynamically-allocate-signal-stack.patch \ %D%/packages/patches/ocaml-4.09-multiple-definitions.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 9d7ec2933a9..82057adf680 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2021, 2022 Vinicius Monego ;;; Copyright © 2022 Michael Rohleder ;;; Copyright © 2022, 2023, 2024 John Kehayias -;;; Copyright © 2022, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022, 2024, 2025 Zheng Junjie ;;; Copyright © 2022 Tobias Kortkamp ;;; Copyright © 2022 Paul A. Patience ;;; Copyright © 2022 dan @@ -1351,6 +1351,7 @@ (define-public ogre-next (url "https://github.com/OGRECave/ogre-next") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "ogre-next-add-riscv64-support.patch")) (sha256 (base32 "1yrlg3s654xbp95208h9a2b8jcwdk69r6sjvll0aiyvxm4c056cw")))) @@ -1358,7 +1359,14 @@ (define-public ogre-next ((#:tests? _ #f) ;; The test suite is currently disabled by the build system ;; (see: https://github.com/OGRECave/ogre-next/issues/466). - #f))) + #f) + ((#:configure-flags flags #~(list)) + (if (target-riscv64?) + #~(cons* + "-DOGRE_SIMD_SSE2=OFF" + "-DOGRE_SIMD_NEON=OFF" + #$flags) + flags)))) (inputs (modify-inputs (package-inputs ogre) (append rapidjson))))) diff --git a/gnu/packages/patches/ogre-next-add-riscv64-support.patch b/gnu/packages/patches/ogre-next-add-riscv64-support.patch new file mode 100644 index 00000000000..37251eaaf20 --- /dev/null +++ b/gnu/packages/patches/ogre-next-add-riscv64-support.patch @@ -0,0 +1,28 @@ +from https://github.com/OGRECave/ogre-next/pull/478 + +From 12081a8f1a0e676ac618dd7c4c1d2e8390c07278 Mon Sep 17 00:00:00 2001 +From: Eric Long +Date: Mon, 18 Nov 2024 21:56:13 +0800 +Subject: [PATCH] Add riscv64 to 64-bit architectures + +--- + OgreMain/include/OgrePlatform.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h +index f9f7a12e46..a977aa2958 100644 +--- a/OgreMain/include/OgrePlatform.h ++++ b/OgreMain/include/OgrePlatform.h +@@ -81,7 +81,8 @@ THE SOFTWARE. + #if defined( __x86_64__ ) || defined( _M_X64 ) || defined( _M_X64 ) || defined( _M_AMD64 ) || \ + defined( __ppc64__ ) || defined( __PPC64__ ) || defined( __arm64__ ) || defined( __aarch64__ ) || \ + defined( _M_ARM64 ) || defined( __mips64 ) || defined( __mips64_ ) || defined( __alpha__ ) || \ +- defined( __ia64__ ) || defined( __e2k__ ) || defined( __s390__ ) || defined( __s390x__ ) ++ defined( __ia64__ ) || defined( __e2k__ ) || defined( __s390__ ) || defined( __s390x__ ) || \ ++ (defined(__riscv) && __riscv_xlen == 64) + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64 + #else + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32 +-- +2.47.1 + base-commit: cb386c3c70212252ddcdb0bb9f6a8ecfd22378a6 -- 2.48.1 ------------=_1743305283-21651-1--