[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#69476] [PATCH 4/8] gnu: ath9k-htc-firmware: Allow using other targe
From: |
Jean-Pierre De Jesus DIAZ |
Subject: |
[bug#69476] [PATCH 4/8] gnu: ath9k-htc-firmware: Allow using other targets. |
Date: |
Thu, 29 Feb 2024 16:20:46 +0100 |
* gnu/packages/firmware.scm (ath9k-htc-firmware): Override the TARGET
environment variable in the configure script to use xtensa-elf.
* gnu/packages/patches/ath9k-htc-firmware-objcopy.patch: Adapt to use
TARGET environment variable for objcopy.
Change-Id: Ia44f0f25dde532b90168f2f2456412a43ac9af24
---
gnu/packages/firmware.scm | 1 +
gnu/packages/patches/ath9k-htc-firmware-objcopy.patch | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index a9f218eb9f..da7835a95d 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -121,6 +121,7 @@ (define-public ath9k-htc-firmware
;; 'configure' is a simple script that runs 'cmake' with
;; the right flags.
(substitute* "configure"
+ (("^TARGET.*$") "TARGET=xtensa-elf\n")
(("^TOOLCHAIN=.*$")
(string-append "TOOLCHAIN="
(assoc-ref (or native-inputs inputs)
"cross-gcc")
diff --git a/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch
b/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch
index 2172f8353f..13c3ca1413 100644
--- a/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch
+++ b/gnu/packages/patches/ath9k-htc-firmware-objcopy.patch
@@ -1,5 +1,5 @@
The firmware is cross-compiled, but the build system ends up using
-'objcopy' instead of 'xtensa-elf-objcopy' by default. Force it to
+'objcopy' instead of '$TARGET-objcopy' by default. Force it to
use the right one.
--- source/target_firmware/configure 2014-10-28 20:57:26.834436561 +0100
@@ -8,7 +8,7 @@ use the right one.
cat > "$TOOLCHAIN_FILE" <<EOF
INCLUDE(CMakeForceCompiler)
-+SET(CMAKE_OBJCOPY xtensa-elf-objcopy)
++SET(CMAKE_OBJCOPY ${TARGET}-objcopy)
SET(CMAKE_SYSTEM_PROCESSOR xtensa)
SET(CMAKE_FIND_ROOT_PATH ${TOOLCHAIN}/$TARGET)
SET(CMAKE_STRIP :)
--
2.41.0
- [bug#69476] [PATCH 0/8] guix: Add xtensa-ath9k-elf platform., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 1/8] doc: Add documentation for x86_64-linux-gnux32., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 6/8] gnu: cross-binutils: Use binutils-2.33 for ath9k., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 7/8] guix: cmake-build-system: Handle unknown systems., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 3/8] gnu: ath9k-htc-firmware: Remove binary blobs., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 4/8] gnu: ath9k-htc-firmware: Allow using other targets.,
Jean-Pierre De Jesus DIAZ <=
- [bug#69476] [PATCH 5/8] gnu: ath9k-htc-firmware: Use xtensa-ath9k-elf., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 8/8] gnu: ath9k-htc-firmware: Split package., Jean-Pierre De Jesus DIAZ, 2024/02/29
- [bug#69476] [PATCH 2/8] guix: Add xtensa-ath9k-elf platform., Jean-Pierre De Jesus DIAZ, 2024/02/29