From: Jan Nieuwenhuizen <janneke@gnu.org>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 39414@debbugs.gnu.org
Subject: [bug#39414] [PATCH 2/2] gnu: commencement: Rationalize search path handling.
Date: Thu, 06 Feb 2020 07:25:33 +0100 [thread overview]
Message-ID: <871rr85j1e.fsf@gnu.org> (raw)
In-Reply-To: <20200204130042.27757-2-ludo@gnu.org> ("Ludovic \=\?utf-8\?Q\?Cou\?\= \=\?utf-8\?Q\?rt\=C3\=A8s\=22's\?\= message of "Tue, 4 Feb 2020 14:00:42 +0100")
Ludovic Courtès writes:
> This commit ensures that only packages that correspond to compilers have
> a search path set. It also reduces manual handling of search path
> environment variables.
Beautiful, thank you!
> (native-inputs `(("binutils" ,binutils-mesboot0)
> - ("gcc" ,gcc-core-mesboot)
> +
> + ;; GCC-CORE-MESBOOT must appear last because it also
> + ;; provides libc headers from Mes that we want to shadow
> + ;; with those of GLIBC-MESBOOT0.
> ("libc" ,glibc-mesboot0)
> + ("kernel-headers" ,%bootstrap-linux-libre-headers)
> + ("gcc" ,gcc-core-mesboot)
>
> ("bash" ,%bootstrap-coreutils&co)
> ("coreutils" ,%bootstrap-coreutils&co)
> ("diffutils" ,diffutils-mesboot)
> - ("kernel-headers" ,%bootstrap-linux-libre-headers)
> ("make" ,make-mesboot0)))
Here it gets real interesting; it seems above you actually fix (or work
around?) a bug that allowed you to...
> (arguments
> (substitute-keyword-arguments (package-arguments gcc-core-mesboot)
> ((#:phases phases)
> `(modify-phases ,phases
> (replace 'setenv
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let ((out (assoc-ref outputs "out"))
> - (bash (assoc-ref %build-inputs "bash"))
> - (gcc (assoc-ref %build-inputs "gcc"))
> - (glibc (assoc-ref %build-inputs "libc"))
> - (kernel-headers (assoc-ref %build-inputs "kernel-headers")))
> - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
> - (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH"))
> - (setenv "C_INCLUDE_PATH" (string-append
> - gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"
> - ":" kernel-headers "/include"
> - ":" glibc "/include"))
> - (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH"))
> - (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH"))
> - ;; FIXME: add glibc dirs to paths manually
> - (setenv "LIBRARY_PATH" (string-join
> - (list (string-append glibc "/lib")
> - (getenv "LIBRARY_PATH"))
> - ":"))
> - (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH"))
> - (with-output-to-file "config.cache"
> - (lambda _
> - (display "
> + (lambda _
> + (setenv "CONFIG_SHELL" (which "sh"))
> + (with-output-to-file "config.cache"
> + (lambda _
> + (display "
> ac_cv_c_float_format='IEEE (little-endian)'
> ")))
> - #t)))
> + #t))
remove this monster. Although I am especially happy with it, I am
unsure exactly how it works.
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let* ((out (assoc-ref outputs "out"))
> - (binutils (assoc-ref %build-inputs "binutils"))
> - (bash (assoc-ref %build-inputs "bash"))
> - (gcc (assoc-ref %build-inputs "gcc"))
> - (glibc (assoc-ref %build-inputs "libc"))
> - (kernel-headers (assoc-ref %build-inputs "kernel-headers")))
> - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
> - (setenv "C_INCLUDE_PATH" (string-append
> - gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include"
> - ":" kernel-headers "/include"
> - ":" glibc "/include"
> - ":" (getcwd) "/mpfr/src"))
> - (setenv "LIBRARY_PATH" (string-append glibc "/lib"
> - ":" gcc "/lib"))
> - (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH"))
> - (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH"))
> - #t)))
> + (lambda _
> + (setenv "CONFIG_SHELL" (which "sh"))
> +
> + ;; Allow MPFR headers to be found.
> + (setenv "C_INCLUDE_PATH"
> + (string-append (getcwd) "/mpfr/src:"
> + (getenv "C_INCLUDE_PATH")))
> +
> + ;; Set the C++ search path so that C headers can be found as
> + ;; libstdc++ is being compiled.
> + (setenv "CPLUS_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
> + #t))
Similar here,
> - "--disable-build-with-cxx")))
> - ((#:phases phases)
> - `(modify-phases ,phases
> - (replace 'setenv
> - (lambda* (#:key outputs #:allow-other-keys)
> - (let* ((out (assoc-ref outputs "out"))
> - (binutils (assoc-ref %build-inputs "binutils"))
> - (bash (assoc-ref %build-inputs "bash"))
> - (gcc (assoc-ref %build-inputs "gcc"))
> - (glibc (assoc-ref %build-inputs "libc"))
> - (kernel-headers (assoc-ref %build-inputs "kernel-headers")))
> - (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
> - (setenv "C_INCLUDE_PATH" (string-append
> - gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include"
> - ":" kernel-headers "/include"
> - ":" glibc "/include"
> - ":" (getcwd) "/mpfr/src"))
> - (setenv "CPLUS_INCLUDE_PATH" (string-append
> - gcc "/lib/gcc-lib/i686-unknown-linux-gnu/4.7.4/include"
> - ":" kernel-headers "/include"
> - ":" glibc "/include"
> - ":" (getcwd) "/mpfr/src"))
> - (setenv "LIBRARY_PATH" (string-append glibc "/lib"
> - ":" gcc "/lib"))
> - (format (current-error-port) "C_INCLUDE_PATH=~a\n" (getenv "C_INCLUDE_PATH"))
> - (format (current-error-port) "CPLUS_INCLUDE_PATH=~a\n" (getenv "CPLUS_INCLUDE_PATH"))
> - (format (current-error-port) "LIBRARY_PATH=~a\n" (getenv "LIBRARY_PATH"))
> - #t))))))))))
> + "--disable-build-with-cxx"))))))))
and same here.
I tried your commit and it works for me. Rebasing `wip-bootstrap' onto
it was some work as you might imagine. The good news is that I finally
got it to "work" again (`wip-bootstrap' @ gitlab); the bad news is
that I have kept (or put back, actually) one of these 'setenv phases in
`gcc-mesboot0'. Well, that's for later worry; so this will need another
look when merging the scheme-only "wip-bootsrap".
For this patch: LVGTM (looks /very/ good to me!).
Thank you!
janneke
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com
next prev parent reply other threads:[~2020-02-06 6:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 12:53 [bug#39414] [PATCH core-updates 0/2] Clarify search path handling in commencement.scm Ludovic Courtès
2020-02-04 13:00 ` [bug#39414] [PATCH 1/2] gnu: commencement: Avoid hard-coded GCC version numbers Ludovic Courtès
2020-02-04 13:00 ` [bug#39414] [PATCH 2/2] gnu: commencement: Rationalize search path handling Ludovic Courtès
2020-02-06 6:25 ` Jan Nieuwenhuizen [this message]
2020-02-06 14:22 ` Ludovic Courtès
2020-02-06 17:48 ` bug#39414: " Ludovic Courtès
2020-02-06 6:16 ` [bug#39414] [PATCH 1/2] gnu: commencement: Avoid hard-coded GCC version numbers Jan Nieuwenhuizen
2020-02-06 6:39 ` [bug#39414] [PATCH core-updates 0/2] Clarify search path handling in commencement.scm Jan Nieuwenhuizen
2020-02-06 14:25 ` Ludovic Courtès
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871rr85j1e.fsf@gnu.org \
--to=janneke@gnu.org \
--cc=39414@debbugs.gnu.org \
--cc=ludo@gnu.org \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).