GNU bug report logs - #72543
[PATCH] gnu: cpu-features: Fix cross-compilation.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Christopher Baines <mail <at> cbaines.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#72543: closed ([PATCH] gnu: cpu-features: Fix cross-compilation.)
Date: Wed, 14 Aug 2024 10:15:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Wed, 14 Aug 2024 11:13:41 +0100
with message-id <87ikw3wgx6.fsf <at> cbaines.net>
and subject line Re: [bug#72543] [PATCH] gnu: cpu-features: Fix cross-compilation.
has caused the debbugs.gnu.org bug report #72543,
regarding [PATCH] gnu: cpu-features: Fix cross-compilation.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
72543: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72543
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: cpu-features: Fix cross-compilation.
Date: Fri,  9 Aug 2024 22:07:05 +0800

* gnu/packages/assembly.scm (cpu-features)[arguments]<#:configure-flags>: When
cross-compilation, set CMAKE_SYSTEM_PROCESSOR.

Change-Id: I8b6f9bdeac66b85ab273f81a320e4b8e0d69b5d0
---
 gnu/packages/assembly.scm | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index b7ccb153d3..5b2518277c 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2022 Felix Gruber <felgru <at> posteo.net>
 ;;; Copyright © 2023 Simon South <simon <at> simonsouth.net>
 ;;; Copyright © 2023 B. Wilson <elaexuotee <at> wilsonb.com>
+;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -664,7 +665,24 @@ (define-public cpu-features
       #:tests? #f
       #:configure-flags
       #~(list "-DBUILD_TESTING=off" ;; XXX: insists on using bundled googletest
-              "-DBUILD_SHARED_LIBS=ON")))
+              "-DBUILD_SHARED_LIBS=ON"
+              #$@(let ((target (%current-target-system)))
+                   (if target
+                       (cond ((string-prefix? "arm" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=arm"))
+                             ((string-prefix? "aarch64" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=aarch64"))
+                             ((string-prefix? "i686" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=x86"))
+                             ((string-prefix? "x86_64" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=x86_64"))
+                             ;; 32-bit and 64-bit
+                             ((string-prefix? "powerpc" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=powerpc"))
+                             ((string-prefix? "riscv64" target)
+                              '("-DCMAKE_SYSTEM_PROCESSOR=riscv64"))
+                             (else '()))
+                       '())))))
     (home-page "https://github.com/google/cpu_features")
     (synopsis "Cross platform C99 library to get cpu features at runtime")
     (description

base-commit: 20dbf225f332ccc707578263ed710dcf2a8fb78e
-- 
2.45.2

[Message part 3 (message/rfc822, inline)]

From: Christopher Baines <mail <at> cbaines.net>
To: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Cc: 72543-done <at> debbugs.gnu.org
Subject: Re: [bug#72543] [PATCH] gnu: cpu-features: Fix cross-compilation.
Date: Wed, 14 Aug 2024 11:13:41 +0100

[Message part 4 (text/plain, inline)]

Zheng Junjie <zhengjunjie <at> iscas.ac.cn> writes:

> * gnu/packages/assembly.scm (cpu-features)[arguments]<#:configure-flags>: When
> cross-compilation, set CMAKE_SYSTEM_PROCESSOR.
>
> Change-Id: I8b6f9bdeac66b85ab273f81a320e4b8e0d69b5d0
> ---
>  gnu/packages/assembly.scm | 20 +++++++++++++++++++-
>  1 file changed, 19 insertions(+), 1 deletion(-)

Looks good to me, I've pushed to master as
e320ed57204363625dc1eb1e393f8535020087e0.

Chris

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.