GNU bug report logs -
#72543
[PATCH] gnu: cpu-features: Fix cross-compilation.
Previous Next
Reported by: Zheng Junjie <zhengjunjie <at> iscas.ac.cn>
Date: Fri, 9 Aug 2024 14:09:02 UTC
Severity: normal
Tags: patch
Done: Christopher Baines <mail <at> cbaines.net>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your bug report
#72543: [PATCH] gnu: cpu-features: Fix cross-compilation.
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 72543 <at> debbugs.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)]
[Message part 3 (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)]
[Message part 5 (message/rfc822, inline)]
* 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
This bug report was last modified 359 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.