tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

gnu: Remove CMAKE_SYSTEM_PROCESSOR from packages.

Browse Source 
* 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 <code@greghogan.com>
This commit is contained in:
Dariqq
2025-08-11 13:57:16 +00:00
committed by Andreas Enge
parent bcc1881485
commit 2ac6de5bc0
2 changed files with 2 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/assembly.scm
View File

@@ -749,24 +749,7 @@ files.")
(list (list
#:tests? #f ;; XXX: insists on using bundled googletest #:tests? #f ;; XXX: insists on using bundled googletest
#:configure-flags #:configure-flags
#~(list "-DBUILD_SHARED_LIBS=ON" #~(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 '()))
'())))))
(home-page "https://github.com/google/cpu_features") (home-page "https://github.com/google/cpu_features")
(synopsis "Cross platform C99 library to get cpu features at runtime") (synopsis "Cross platform C99 library to get cpu features at runtime")
(description (description

21
gnu/packages/image.scm
View File

@@ -1994,26 +1994,7 @@ is hereby granted."))))
#$@(if (or (target-ppc32?) #$@(if (or (target-ppc32?)
(target-riscv64?)) (target-riscv64?))
'("-DFLOATTEST=NO") '("-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/") (home-page "https://libjpeg-turbo.org/")
(synopsis "SIMD-accelerated JPEG image handling library") (synopsis "SIMD-accelerated JPEG image handling library")
(description "libjpeg-turbo is a JPEG image codec that accelerates baseline (description "libjpeg-turbo is a JPEG image codec that accelerates baseline