From: Jean-Pierre De Jesus DIAZ via Guix-patches via <guix-patches@gnu.org>
To: 66263@debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean@foundationdevices.com>
Subject: [bug#66263] [PATCH v1 07/22] gnu: cross-gcc: Enable multilib for AVR.
Date: Tue, 28 Nov 2023 12:34:50 +0100 [thread overview]
Message-ID: <20231128113510.11214-7-jean@foundationdevices.com> (raw)
In-Reply-To: <20230929091333.7623-1-jean@foundationdevices.com>
* gnu/build/cross-toolchain.scm (patch-multilib-shebang): New procedure.
* gnu/packages/avr.scm (make-avr-gcc): Remove uneeded phases and flags
for multilib.
* gnu/packages/cross-base (cross-gcc-arguments) <#:configure-flags>
[target-avr?]: Remove --disable-multilib and add --enable-multilib.
Change-Id: Id68d803057ac898f0a670f10487b08bf0891ab0b
---
gnu/build/cross-toolchain.scm | 10 ++++++++++
gnu/packages/avr.scm | 13 +------------
gnu/packages/cross-base.scm | 16 ++++++++++++----
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm
index 9746be3e50..085b88a2c3 100644
--- a/gnu/build/cross-toolchain.scm
+++ b/gnu/build/cross-toolchain.scm
@@ -48,6 +48,14 @@ (define %gcc-cross-include-paths
;; Search path for target headers when cross-compiling.
(map (cut string-append "CROSS_" <>) %gcc-include-paths))
+(define* (patch-genmultilib-shebang #:key inputs native-inputs #:allow-other-keys)
+ "Patch shebangs in the gcc/genmultilib file as it contains several scripts
+inside, each with a #!/bin/sh that needs patching."
+ (substitute* "gcc/genmultilib"
+ (("#!/bin/sh")
+ (string-append "#!" (assoc-ref (or native-inputs inputs) "bash")
+ "/bin/bash"))))
+
(define* (make-cross-binutils-visible #:key outputs inputs target
#:allow-other-keys)
"Create symlinks for 'as', 'nm', and 'ld' in the \"out\" output, under
@@ -173,6 +181,8 @@ (define* (cross-gcc-build-phases target
"Modify PHASES to include everything needed to build a cross-GCC for TARGET,
a target triplet."
(modify-phases phases
+ (add-after 'unpack 'patch-genmultilib-shebang
+ patch-genmultilib-shebang)
(add-before 'configure 'set-cross-path
;; This mingw32 target checking logic should match that of target-mingw?
;; in (guix utils), but (guix utils) is too large too copy over to the
diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm
index c035df2b1d..ac09b799f3 100644
--- a/gnu/packages/avr.scm
+++ b/gnu/packages/avr.scm
@@ -84,18 +84,7 @@ (define* (make-avr-gcc/implementation #:key (xgcc gcc))
(format #t
"environment variable `CPLUS_INCLUDE_PATH' \
changed to ~a~%"
- (getenv "CPLUS_INCLUDE_PATH")))))
- ;; Without a working multilib build, the resulting GCC lacks
- ;; support for nearly every AVR chip.
- (add-after 'unpack 'fix-genmultilib
- (lambda _
- ;; patch-shebang doesn't work here because there are
- ;; actually several scripts inside this script, each with
- ;; a #!/bin/sh that needs patching.
- (substitute* "gcc/genmultilib"
- (("#!/bin/sh") (string-append "#!" (which "sh"))))))))
- ((#:configure-flags flags)
- #~(delete "--disable-multilib" #$flags))))
+ (getenv "CPLUS_INCLUDE_PATH")))))))))
(native-search-paths
(list (search-path-specification
(variable "CROSS_C_INCLUDE_PATH")
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index 4b7c4b6cbe..dcb1c3efa8 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Josselin Poiret <dev@jpoiret.xyz>
+;;; Copyright © 2023 Foundation Devices, Inc. <hello@foundationdevices.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -196,12 +197,19 @@ (define (cross-gcc-arguments target xgcc libc)
#~((string-append "--with-toolexeclibdir="
(assoc-ref %outputs "lib")
"/" #$target "/lib"))
+ #~())
+
+ #$@(if (target-avr? target)
+ #~("--enable-multilib")
#~()))
- #$(if libc
- flags
- #~(remove (cut string-match "--enable-languages.*" <>)
- #$flags))))
+ (remove
+ (lambda (flag)
+ (or (and #$libc
+ (string-prefix? "--enable-languages" flag))
+ (and #$(target-avr? target)
+ (string=? flag "--disable-multilib"))))
+ #$flags)))
((#:make-flags flags)
(if libc
#~(let ((libc (assoc-ref %build-inputs "libc")))
--
2.41.0
next prev parent reply other threads:[~2023-11-28 11:38 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-29 9:13 [bug#66263] [PATCH 00/23] guix: Add avr as a platform Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-09-29 9:16 ` [bug#66263] [PATCH 01/23] gnu: cross-libc: Return #f if no libc available Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-09-29 9:16 ` [bug#66263] [PATCH 02/23] guix: gnu: Handle platforms without libc Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-09-29 9:16 ` [bug#66263] [PATCH 03/23] gnu: Add avr platform Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-09-29 9:16 ` [bug#66263] [PATCH 04/23] guix: utils: Add target-avr? Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-04 14:07 ` Efraim Flashner
2023-09-29 9:16 ` [bug#66263] [PATCH 05/23] gnu: cross-gcc: Enable multilib for avr Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 4:15 ` [bug#66263] [PATCH 00/23] guix: Add avr as a platform Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 06/23] gnu: microscheme: Move to avr-xyz Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-04 14:07 ` Efraim Flashner
2023-10-05 4:19 ` [bug#66263] [PATCH 00/23] guix: Add avr as a platform Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 07/23] gnu: Add AVR phases to cross-gcc-build-phases Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-09-29 9:16 ` [bug#66263] [PATCH 08/23] gnu: avr-libc: Convert to procedure Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 4:17 ` [bug#66263] [PATCH 00/23] guix: Add avr as a platform Maxim Cournoyer
2023-10-05 4:23 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 09/23] gnu: Add make-cross-gcc-toolchain Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-04 14:07 ` Efraim Flashner
2023-10-05 4:34 ` [bug#66263] [PATCH 00/23] guix: Add avr as a platform Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 10/23] gnu: Add binutils-cross-avr Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 14:46 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 11/23] gnu: avr-binutils: Deprecate package Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 14:48 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 12/23] gnu: Remove various AVR packages Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 14:51 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 13/23] gnu: cross-libc: Add AVR Libc case Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 14:52 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 14/23] gnu: cross-gcc-arguments: Handle AVR target Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 14:59 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 15/23] guix: meson-configuration: Fix boolean assigment Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 15:00 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 16/23] gnu: cross-gcc-search-paths: Handle AVR target Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 15:08 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 17/23] gnu: cross-gcc: Handle inputs for AVR Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 15:08 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 18/23] gnu: Add avr-libc Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 15:10 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 19/23] gnu: Add gcc-cross-avr-toolchain Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 15:11 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 20/23] gnu: Add avr-toolchain Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-09-29 9:16 ` [bug#66263] [PATCH 21/23] guix: meson-build-system: Support AVR Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 15:13 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 22/23] guix: meson-build-system: Disable PIC for AVR Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 15:14 ` Maxim Cournoyer
2023-09-29 9:16 ` [bug#66263] [PATCH 23/23] gnu: Add unity Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-10-05 15:19 ` Maxim Cournoyer
2023-09-29 9:18 ` [bug#66263] [PATCH 00/23] guix: Add avr as a platform Jean-Pierre De Jesus Diaz via Guix-patches via
2023-10-04 13:01 ` Mathieu Othacehe
2023-10-05 15:20 ` Maxim Cournoyer
2023-12-06 21:57 ` Ludovic Courtès
2023-11-28 11:34 ` [bug#66263] [PATCH v1 01/22] gnu: cross-libc: Return #f if no libc available Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 02/22] guix: gnu-build-system: Handle missing libc Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 03/22] guix: Add avr platform Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 04/22] guix: Add target-avr? Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 05/22] gnu: microscheme: Move to avr-xyz Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 06/22] gnu: make-avr-libc: Fix synopsis Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` Jean-Pierre De Jesus DIAZ via Guix-patches via [this message]
2023-11-28 11:34 ` [bug#66263] [PATCH v1 08/22] gnu: cross-gcc: Handle target include paths Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 09/22] gnu: cross-libc: Add AVR Libc support Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 10/22] gnu: cross-gcc: Handle AVR inputs Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 11/22] gnu: cross-toolchain: Add set-cross-path for AVR Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 12/22] gnu: cross-gcc: Find AVR Libc files Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 13/22] gnu: cross-gcc: Only C and C++ for AVR Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 14/22] guix: meson-build-system: Support AVR Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 15/22] guix: meson-build-system: Disable PIC for AVR Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:34 ` [bug#66263] [PATCH v1 16/22] gnu: Add cross-gcc-toolchain procedure Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:35 ` [bug#66263] [PATCH v1 17/22] gnu: Add gcc-cross-avr-toolchain Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:35 ` [bug#66263] [PATCH v1 18/22] gnu: make-ergodox-firmware: Use AVR target Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:35 ` [bug#66263] [PATCH v1 19/22] gnu: make-qmk-firmware: " Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:35 ` [bug#66263] [PATCH v1 20/22] gnu: lufa: " Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:35 ` [bug#66263] [PATCH v1 21/22] gnu: Add gcc-cross-i686-w64-mingw32-toolchain Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:35 ` [bug#66263] [PATCH v1 22/22] gnu: Add gcc-cross-x86_64-w64-mingw32-toolchain Jean-Pierre De Jesus DIAZ via Guix-patches via
2023-11-28 11:50 ` [bug#66263] Updated patch series Jean-Pierre De Jesus Diaz via Guix-patches via
2023-12-11 11:58 ` bug#66263: " Efraim Flashner
2023-12-11 12:30 ` [bug#66263] " Jean-Pierre De Jesus Diaz via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231128113510.11214-7-jean@foundationdevices.com \
--to=guix-patches@gnu.org \
--cc=66263@debbugs.gnu.org \
--cc=jean@foundationdevices.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.