From c3aba93823583bfebae93ce1b9484a0c37fb3008 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Thu, 29 Feb 2024 16:20:46 +0100 Subject: gnu: ath9k-htc-firmware: Allow using other targets. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 Signed-off-by: Ludovic Courtès --- 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 1d89dfba00..7923f5c908 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -121,6 +121,7 @@ ;; '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" <