[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/26: gnu: gcc-4.7: On powerpc64le, fix /lib64 references.
From: |
guix-commits |
Subject: |
06/26: gnu: gcc-4.7: On powerpc64le, fix /lib64 references. |
Date: |
Sun, 7 Mar 2021 22:00:14 -0500 (EST) |
marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit 8144bb6590aa2a404bde4809ea8515fc307050ce
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Sat Feb 6 16:29:40 2021 -0800
gnu: gcc-4.7: On powerpc64le, fix /lib64 references.
Fixes: <https://bugs.gnu.org/46253>.
* gnu/packages/gcc.scm (gcc-4.7)[#:phases][pre-configure]: When the
gcc/config/rs6000 directory exists, replace "/lib64" with "/lib" in all
files
within it. Note that this fix will be picked up by any package that re-uses
the pre-configure phase from gcc-4.7 (e.g., all the usual gcc packages).
(make-libstdc++)[#:phases][fix-rs6000-libdir]: New phase, which does the
same
as above. It was necessary to duplicate the fix here because make-libstdc++
does not re-use the pre-configure phase from gcc-4.7.
---
gnu/packages/gcc.scm | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 9b2a555..1615be0 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -10,6 +10,7 @@
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
+;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -273,6 +274,11 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
~a"
libc line))))
+ (when (file-exists? "gcc/config/rs6000")
+ ;; Force powerpc libdir to be /lib and not /lib64
+ (substitute* (find-files "gcc/config/rs6000")
+ (("/lib64") "/lib")))
+
;; Don't retain a dependency on the build-time sed.
(substitute* "fixincludes/fixincl.x"
(("static char const sed_cmd_z\\[\\] =.*;")
@@ -589,12 +595,19 @@ using compilers other than GCC."
(name "libstdc++")
(arguments
`(#:out-of-source? #t
- #:phases (alist-cons-before
- 'configure 'chdir
- (lambda _
- (chdir "libstdc++-v3")
- #t)
- %standard-phases)
+ #:phases
+ (modify-phases %standard-phases
+ ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
+ (add-before 'configure 'fix-rs6000-libdir
+ (lambda _
+ (when (file-exists? "gcc/config/rs6000")
+ (substitute* (find-files "gcc/config/rs6000")
+ (("/lib64") "/lib")))
+ #t))
+ (add-before 'configure 'chdir
+ (lambda _
+ (chdir "libstdc++-v3")
+ #t)))
#:configure-flags `("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out")
- branch wip-ppc64le created (now 82d2419), guix-commits, 2021/03/07
- 02/26: gnu: gcc-boot0: Enable 128-bit long double for POWER9., guix-commits, 2021/03/07
- 03/26: utils: Add target-powerpc? procedure., guix-commits, 2021/03/07
- 04/26: gnu: binutils-final: Provide bash for binary on powerpc-linux., guix-commits, 2021/03/07
- 07/26: gnu: glibc: Fix ldd path on powerpc*., guix-commits, 2021/03/07
- 08/26: gnu: bdb-4.8: Fix configure on powerpc64le-linux., guix-commits, 2021/03/07
- 01/26: gnu: bootstrap: Add support for powerpc64le-linux., guix-commits, 2021/03/07
- 05/26: gnu: binutils-final: Support more Power architectures., guix-commits, 2021/03/07
- 06/26: gnu: gcc-4.7: On powerpc64le, fix /lib64 references.,
guix-commits <=
- 09/26: gnu: guile-avahi: Fix compilation on powerpc64le-linux., guix-commits, 2021/03/07
- 11/26: gnu: texlive-latex-base: Fix compilation on powerpc64le*., guix-commits, 2021/03/07
- 12/26: gnu: libelf: Fix compilation for powerpc64le-linux., guix-commits, 2021/03/07
- 15/26: syscalls: Fix RNDADDTOENTCNT on powerpc64le-linux., guix-commits, 2021/03/07
- 23/26: gnu: openjpeg: Disable failing tests group., guix-commits, 2021/03/07
- 24/26: gnu: rust: Make it "supported" on all systems but i686-linux., guix-commits, 2021/03/07
- 25/26: tests: guix-environment.sh: Use C_INCLUDE_PATH, not CPATH., guix-commits, 2021/03/07
- 10/26: gnu: texlive-bin: Fix compilation on powerpc64le*., guix-commits, 2021/03/07
- 13/26: Add powerpc64le-linux as a supported Guix architecture., guix-commits, 2021/03/07
- 14/26: syscalls: Fix clone on powerpc64le-linux., guix-commits, 2021/03/07