diff options
Diffstat (limited to 'gnu/packages/commencement.scm')
-rw-r--r-- | gnu/packages/commencement.scm | 79 |
1 files changed, 3 insertions, 76 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 76e879b47b..e8b47fbeab 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1265,7 +1265,7 @@ ac_cv_c_float_format='IEEE (little-endian)' (install-file "gawk" bin) (symlink "gawk" (string-append bin "/awk")))))))))) -(define-public glibc-mesboot0 +(define glibc-mesboot0 ;; GNU C Library 2.2.5 is the most recent glibc that we managed to build ;; using gcc-2.95.3. Newer versions (2.3.x, 2.6, 2.1x) seem to need a newer ;; gcc. @@ -1359,7 +1359,7 @@ ac_cv_c_float_format='IEEE (little-endian)' "SHELL = " shell " BASH = "))))))))))) -(define-public gcc-mesboot0 +(define gcc-mesboot0 (package (inherit gcc-core-mesboot0) (name "gcc-mesboot0") @@ -1403,63 +1403,6 @@ ac_cv_c_float_format='IEEE (little-endian)' ,(string-append "LIBGCC2_INCLUDES=-I " gcc "/include") "LANGUAGES=c"))))))) -(define-public gcc-2.95-wrapper - ;; We need this so gcc-mesboot0 can be used to create shared binaries that - ;; have the correct interpreter, otherwise configuring gcc-mesboot using - ;; --enable-shared will fail. - (package - (inherit gcc-mesboot0) - (name "gcc-wrapper") - (source #f) - (inputs '()) - (native-inputs - `(("bash" ,bash-minimal) - ("coreutils" ,coreutils) - ("libc" ,glibc-2.2.5) - ("gcc" ,gcc-mesboot0))) - (arguments - `(#:implicit-inputs? #f - #:phases - (modify-phases %standard-phases - (delete 'unpack) - (delete 'configure) - (delete 'install) - (replace 'build - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (assoc-ref inputs "bash")) - (libc (assoc-ref inputs "libc")) - (gcc (assoc-ref inputs "gcc")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (for-each - (lambda (program) - (let ((wrapper (string-append bin "/" program))) - (with-output-to-file wrapper - (lambda _ - (display (string-append "#! " bash "/bin/bash -exec " gcc "/bin/" program -" -Wl,--dynamic-linker" -;; also for x86_64-linux, we are still on i686-linux -" -Wl," libc ,(glibc-dynamic-linker "i686-linux") -" -Wl,--rpath" -" -Wl," libc "/lib" -" \"$@\" -")) - (chmod wrapper #o555))))) - '("cpp" - "gcc" - "g++" - "i686-unknown-linux-gnu-cpp" - "i686-unknown-linux-gnu-gcc" - "i686-unknown-linux-gnu-g++"))))) - (replace 'check - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (program (string-append bin "/gcc"))) - (invoke program "--help"))))))))) - (define (%boot-mesboot0-inputs) `(("gcc" ,gcc-mesboot0) ("kernel-headers" ,%bootstrap-linux-libre-headers) @@ -2050,7 +1993,7 @@ exec " gcc "/bin/" program (lambda _ (invoke "./hello")))))))) -(define-public binutils-mesboot +(define binutils-mesboot (package (inherit binutils) (name "binutils-mesboot") @@ -3636,9 +3579,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define (%boot3-inputs) ;; 4th stage inputs. `(("gcc" ,gcc-final) - ,@(if (target-riscv64?) - `(("gcc:lib" ,gcc-final "lib")) - '()) ("ld-wrapper" ,ld-wrapper-boot3) ,@(alist-delete "gcc" (%boot2-inputs)))) @@ -3794,19 +3734,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ("libc:static" ,glibc-final "static") ("locales" ,glibc-utf8-locales-final)))) -(define-public %final-inputs-riscv64 - ;; This is similar to the added (list gcc "lib") elsewhere in this file, but - ;; due to how (%current-system) is re-defined when performing builds with the - ;; '--system' flag, %final-inputs is too early in the evaulation pipeline to - ;; correctly identify the system for which a derivation will be built. Thus, - ;; since (%current-system) is re-determined by (guix build-system gnu) after - ;; loading %final-inputs but before taking into account the '--system' flag, - ;; the test for (target-riscv64?) needs to be in (guix build-system gnu), - ;; with %final-inputs-riscv64 already available at the same time that - ;; %final-inputs is available. - `(("gcc:lib" ,gcc-final "lib") - ,@%final-inputs)) - (define-public canonical-package (let ((name->package (fold (lambda (input result) (match input |