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

gnu: gcc-2.95: Support more systems.

Browse source 
* gnu/packages/gcc.scm (gcc-2.95)[supported-systems]: Allow all except
powerpc64le-linux and riscv64-linux.
[arguments]: Set #:system to the 32-bit version of our supported 64-bit
architectures. Modify custom 'set-dynamic-linker-file-name phase to use
the glibc-dynamic-linker for the selected system, and to substitute more
locations.
This commit is contained in:
Efraim Flashner 2022-02-15 10:21:47 +02:00
parent ae03f40138
commit 3f929203cf
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 52 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gnu/packages/gcc.scm
View file

@ -50,6 +50,7 @@ (define-module (gnu packages gcc)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (ice-9 match)
#:use-module (ice-9 regex)) #:use-module (ice-9 regex))
(define %gcc-infrastructure (define %gcc-infrastructure
@ -696,13 +697,24 @@ (define-public gcc-2.95
(substitute* "configure" (substitute* "configure"
(("host_tools=(.*)texinfo" _ before) (("host_tools=(.*)texinfo" _ before)
(string-append "host_tools=" before))))))) (string-append "host_tools=" before)))))))
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems (fold delete %supported-systems
'("powerpc64le-linux" "riscv64-linux")))
(native-inputs (list texinfo dejagnu)) (native-inputs (list texinfo dejagnu))
(inputs '()) (inputs '())
(propagated-inputs '()) (propagated-inputs '())
(outputs '("out")) (outputs '("out"))
(arguments (arguments
(list #:system "i686-linux" ;x86_64 didn't exist back then (let ((matching-system
(match (%current-system)
;; This package predates our 64-bit architectures.
;; Force a 32-bit build targeting a similar architecture.
("aarch64-linux"
"armhf-linux")
("x86_64-linux"
"i686-linux")
(_
(%current-system)))))
(list #:system matching-system
#:configure-flags #~'("--disable-werror") #:configure-flags #~'("--disable-werror")
#:phases #:phases
@ -710,9 +722,22 @@ (define-public gcc-2.95
(add-before 'configure 'set-dynamic-linker-file-name (add-before 'configure 'set-dynamic-linker-file-name
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Tell GCC what the real loader file name is. ;; Tell GCC what the real loader file name is.
(substitute* "gcc/config/i386/linux.h" (substitute* '("gcc/config/alpha/linux-elf.h"
(("/lib/ld-linux\\.so\\.[12]") "gcc/config/m68k/linux.h"
(search-input-file inputs "/lib/ld-linux.so.2"))))) "gcc/config/mips/linux.h"
"gcc/config/rs6000/linux.h")
(("/lib/ld\\.so\\.1")
(search-input-file
inputs #$(glibc-dynamic-linker matching-system))))
(substitute* '("gcc/config/alpha/linux-elf.h"
"gcc/config/arm/linux-elf.h"
"gcc/config/i386/linux.h"
"gcc/config/m68k/linux.h"
"gcc/config/sparc/linux.h"
"gcc/config/sparc/linux64.h")
(("/lib(64)?/ld-linux\\.so\\.[12]")
(search-input-file
inputs #$(glibc-dynamic-linker matching-system))))))
(replace 'configure (replace 'configure
(lambda* (#:key outputs build configure-flags (lambda* (#:key outputs build configure-flags
#:allow-other-keys) #:allow-other-keys)
@ -728,7 +753,7 @@ (define-public gcc-2.95
;; Go ahead despite the many warnings. ;; Go ahead despite the many warnings.
(substitute* '("Makefile.in" "gcc/Makefile.in") (substitute* '("Makefile.in" "gcc/Makefile.in")
(("^MAKEINFOFLAGS =.*") (("^MAKEINFOFLAGS =.*")
"MAKEINFOFLAGS = --force\n"))))))) "MAKEINFOFLAGS = --force\n"))))))))
(native-search-paths (native-search-paths
;; This package supports nothing but the C language. ;; This package supports nothing but the C language.
(list (search-path-specification (list (search-path-specification