diff options
author | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:47:50 +0100 |
commit | da77ea23daa0bfa4a73290dff99b22d6825ff80b (patch) | |
tree | 748d24e62b93c8ab8f999d6415d9f65c3d317da2 /gnu/packages/cross-base.scm | |
parent | 4eeb6922449285f9bce615f6e4ffe4375fa0233f (diff) | |
parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) | |
download | guix-da77ea23daa0bfa4a73290dff99b22d6825ff80b.tar guix-da77ea23daa0bfa4a73290dff99b22d6825ff80b.tar.gz |
Merge commit '949f97f7f9' into core-update-new-2chris-core-updates-no-duplicates-attempt
Change-Id: Ibbd851541da42cc052ba58195fee033daadd57e5
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/llvm.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/packages/cross-base.scm')
-rw-r--r-- | gnu/packages/cross-base.scm | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 46f68aa8d7..6ee313a6f6 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -97,7 +97,18 @@ (warning (G_ "'cross-binutils' must be used with keyword arguments~%")) (cross-binutils* target #:binutils binutils)) -(define* (cross-binutils* target #:key (binutils binutils)) +(define (cross-binutils-package target) + "Returns the default package to use for a cross-Binutils for TARGET." + (cond + ;; The xtensa-ath9k-elf target is used solely to build the firmware for + ;; ath9k devices, the patches to binutils have not been updated and + ;; only apply to binutils@2.33. + ((string=? target "xtensa-ath9k-elf") binutils-2.33) + (else binutils))) + +(define* (cross-binutils* target + #:key + (binutils (cross-binutils-package target))) "Return a cross-Binutils for TARGET using BINUTILS." (let ((binutils (package (inherit binutils) @@ -118,8 +129,8 @@ ;; target libs, not native libs, so this is safe. #~(cons "--with-sysroot=/" #$flags))))))) - ;; For Xtensa, apply Qualcomm's patch. - (cross (cond ((string-prefix? "xtensa-" target) + ;; For xtensa-ath9k-elf, apply Qualcomm's patch. + (cross (cond ((string=? target "xtensa-ath9k-elf") (package-with-patches binutils (search-patches "ath9k-htc-firmware-binutils.patch"))) @@ -249,7 +260,9 @@ base compiler and using LIBC (which may be either a libc package or #f.)" ;; Patch by Qualcomm needed to build the ath9k-htc firmware. (search-patches "ath9k-htc-firmware-gcc.patch")) ((target-mingw? target) - (append (search-patches "gcc-4.9.3-mingw-gthr-default.patch") + (append (if (not (version>=? (package-version xgcc) "13.0")) + (search-patches "gcc-4.9.3-mingw-gthr-default.patch") + '()) (if (version>=? (package-version xgcc) "7.0") (search-patches "gcc-7-cross-mingw.patch") '()))) @@ -318,6 +331,10 @@ target that libc." (append (origin-patches (package-source xgcc)) (append (cond + ((version>=? (package-version xgcc) "13.0") + (search-patches "gcc-13-cross-system-header-dir.patch" + "gcc-12-cross-environment-variables.patch" + "gcc-cross-gxx-include-dir.patch")) ((version>=? (package-version xgcc) "12.0") (search-patches "gcc-12-cross-environment-variables.patch" "gcc-cross-gxx-include-dir.patch")) |