mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 21:46:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

draft: gcc-core-mesboot1: adjust for aarch64-linux

Browse source 
(%current-system) evaluated too early
use correct dynamic-linker
parameterize architecture in path
This commit is contained in:
Efraim Flashner 2022-12-13 14:04:41 +02:00
parent dac195c8f1
commit 7966084069
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gnu/packages/commencement.scm
View file

@ -1443,29 +1443,29 @@ (define gcc-core-mesboot1
;; stricly needed, but very helpful for development because it builds ;; stricly needed, but very helpful for development because it builds
;; relatively fast. If this configures and builds then gcc-mesboot1 also ;; relatively fast. If this configures and builds then gcc-mesboot1 also
;; builds. ;; builds.
(let ((triplet (match (%current-system) (package
((or "armhf-linux" "aarch64-linux") (inherit gcc-mesboot0)
"arm-unknown-linux-gnu") (name "gcc-core-mesboot1")
((or "i686-linux" "x86_64-linux") (version "4.6.4")
"i686-unknown-linux-gnu")))) (source (origin
(package (method url-fetch)
(inherit gcc-mesboot0) (uri (string-append "mirror://gnu/gcc/gcc-"
(name "gcc-core-mesboot1") version "/gcc-core-" version ".tar.gz"))
(version "4.6.4") (sha256
(source (origin (base32
(method url-fetch) "173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75"))))
(uri (string-append "mirror://gnu/gcc/gcc-" (supported-systems '("armhf-linux" "aarch64-linux"
version "/gcc-core-" version ".tar.gz")) "i686-linux" "x86_64-linux"))
(sha256 (inputs `(("gmp-source" ,gmp-boot)
(base32 ("mpfr-source" ,mpfr-boot)
"173kdb188qg79pcz073cj9967rs2vzanyjdjyxy9v0xb0p5sad75")))) ("mpc-source" ,mpc-boot)))
(supported-systems '("armhf-linux" "aarch64-linux" (native-inputs (%boot-mesboot1-inputs))
"i686-linux" "x86_64-linux")) (arguments
(inputs `(("gmp-source" ,gmp-boot) (let ((triplet (match (%current-system)
("mpfr-source" ,mpfr-boot) ((or "armhf-linux" "aarch64-linux")
("mpc-source" ,mpc-boot))) "arm-unknown-linux-gnu")
(native-inputs (%boot-mesboot1-inputs)) ((or "i686-linux" "x86_64-linux")
(arguments "i686-unknown-linux-gnu"))))
(list #:implicit-inputs? #f (list #:implicit-inputs? #f
#:guile %bootstrap-guile #:guile %bootstrap-guile
#:tests? #f #:tests? #f
@ -1479,7 +1479,11 @@ (define gcc-core-mesboot1
"-B" libc "/lib " "-B" libc "/lib "
"-Wl,-dynamic-linker " "-Wl,-dynamic-linker "
"-Wl," libc "-Wl," libc
#$(glibc-dynamic-linker "i686-linux")))) (match #$triplet
("i686-unknown-linux-gnu"
#$(glibc-dynamic-linker "i686-linux"))
("arm-unknown-linux-gnu"
#$(glibc-dynamic-linker "armhf-linux"))))))
(list (string-append "LDFLAGS=" ldflags) (list (string-append "LDFLAGS=" ldflags)
(string-append "LDFLAGS_FOR_TARGET=" ldflags))) (string-append "LDFLAGS_FOR_TARGET=" ldflags)))
#:configure-flags #:configure-flags
@ -1561,7 +1565,7 @@ (define gcc-core-mesboot1
(kernel-headers (assoc-ref %build-inputs "kernel-headers"))) (kernel-headers (assoc-ref %build-inputs "kernel-headers")))
(setenv "CONFIG_SHELL" (string-append bash "/bin/sh")) (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
(setenv "C_INCLUDE_PATH" (string-append (setenv "C_INCLUDE_PATH" (string-append
gcc "/lib/gcc-lib/i686-unknown-linux-gnu/2.95.3/include" gcc "/lib/gcc-lib/" #$triplet "/2.95.3/include"
":" kernel-headers "/include" ":" kernel-headers "/include"
":" glibc "/include" ":" glibc "/include"
":" (getcwd) "/mpfr/src")) ":" (getcwd) "/mpfr/src"))