guix_mirror_bot pushed a commit to branch c++-team
in repository guix.
commit 19a386565b92775aaa0aaf342959cdf752ee2340
Author: Dariqq <[email protected]>
AuthorDate: Mon Aug 11 13:57:16 2025 +0000
gnu: Remove CMAKE_SYSTEM_PROCESSOR from packages.
* gnu/packages/assembly.scm (cpu-features): Remove -DCMAKE_SYSTEM_PROCESSOR
flag when cross compiling
* gnu/packages/image.scm (libjpeg-turbo): Same.
Change-Id: Iaa344b7c45d4fa423765df8a6022adb584724feb
Signed-off-by: Greg Hogan <[email protected]>
---
gnu/packages/assembly.scm | 19 +------------------
gnu/packages/image.scm | 21 +--------------------
2 files changed, 2 insertions(+), 38 deletions(-)
diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm
index 19c8fdd946..29e98a3a0c 100644
--- a/gnu/packages/assembly.scm
+++ b/gnu/packages/assembly.scm
@@ -749,24 +749,7 @@ files.")
(list
#:tests? #f ;; XXX: insists on using bundled googletest
#:configure-flags
- #~(list "-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 '()))
- '())))))
+ #~(list "-DBUILD_SHARED_LIBS=ON")))
(home-page "https://github.com/google/cpu_features";)
(synopsis "Cross platform C99 library to get cpu features at runtime")
(description
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 3a29490373..f9fd826ea6 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1975,26 +1975,7 @@ is hereby granted."))))
#$@(if (or (target-ppc32?)
(target-riscv64?))
'("-DFLOATTEST=NO")
- '())
- ;; The build system probes for the current CPU, but
- ;; that fails when cross-compiling.
- #$@(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://libjpeg-turbo.org/";)
(synopsis "SIMD-accelerated JPEG image handling library")
(description "libjpeg-turbo is a JPEG image codec that accelerates baseline
