From: Chris Marusich <cmmarusich@gmail.com>
To: 47182@debbugs.gnu.org
Cc: Chris Marusich <cmmarusich@gmail.com>
Subject: [bug#47182] [PATCH 03/18] gnu: gcc-4.7: On powerpc64le, fix /lib64 references.
Date: Mon, 15 Mar 2021 23:44:56 -0700 [thread overview]
Message-ID: <20210316064511.2891553-3-cmmarusich@gmail.com> (raw)
In-Reply-To: <20210316064511.2891553-1-cmmarusich@gmail.com>
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 | 38 +++++++++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 4d5aaa70701..3ea8695cf18 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -3,13 +3,14 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; 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,14 @@ where the OS part is overloaded to denote a specific ABI---into GCC
~a"
libc line))))
+ ;; TODO: Make this unconditional in core-updates.
+ ,@(if (target-powerpc?)
+ `((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\\[\\] =.*;")
@@ -598,12 +607,27 @@ 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
+ ;; TODO: Use the target-powerpc arm for everyone.
+ ,(if (target-powerpc?)
+ `(modify-phases %standard-phases
+ ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
+ (add-before 'chdir '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)))
+ `(alist-cons-before 'configure 'chdir
+ (lambda _
+ (chdir "libstdc++-v3")
+ #t)
+ %standard-phases))
+
#:configure-flags `("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out")
--
2.26.2
next prev parent reply other threads:[~2021-03-16 6:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 6:28 [bug#47182] [PATCH 00/18] Add support for powerpc64le-linux (wip-ppc64le-for-master) Chris Marusich
2021-03-16 6:44 ` [bug#47182] [PATCH 01/18] gnu: bootstrap: Add support for powerpc64le-linux Chris Marusich
2021-03-16 6:44 ` [bug#47182] [PATCH 02/18] utils: Add target-powerpc? procedure Chris Marusich
2021-03-16 6:44 ` Chris Marusich [this message]
2021-03-16 6:44 ` [bug#47182] [PATCH 04/18] gnu: glibc: Fix ldd path on powerpc* Chris Marusich
2021-03-16 7:45 ` Efraim Flashner
2021-03-16 6:44 ` [bug#47182] [PATCH 05/18] gnu: gcc-boot0: Enable 128-bit long double for POWER9 Chris Marusich
2021-03-16 6:44 ` [bug#47182] [PATCH 06/18] gnu: binutils-final: Provide bash for binary on powerpc-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 07/18] gnu: binutils-final: Support more Power architectures Chris Marusich
2021-03-16 7:49 ` Efraim Flashner
2021-03-18 6:10 ` [bug#47182] [PATCH 00/18] Add support for powerpc64le-linux (wip-ppc64le-for-master) Chris Marusich
2021-03-18 8:29 ` Efraim Flashner
2021-03-16 6:45 ` [bug#47182] [PATCH 08/18] gnu: bdb-4.8: Fix configure on powerpc64le-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 09/18] gnu: guile-avahi: Fix compilation " Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 10/18] gnu: texlive-bin: Fix compilation on powerpc64le* Chris Marusich
2021-03-16 7:53 ` Efraim Flashner
2021-03-18 6:16 ` [bug#47182] [PATCH 00/18] Add support for powerpc64le-linux (wip-ppc64le-for-master) Chris Marusich
2021-03-18 8:34 ` Efraim Flashner
2021-03-19 6:22 ` Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 11/18] gnu: texlive-latex-base: Fix compilation on powerpc64le* Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 12/18] gnu: libelf: Fix compilation for powerpc64le-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 13/18] Add powerpc64le-linux as a supported Guix architecture Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 14/18] syscalls: Fix clone on powerpc64le-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 15/18] syscalls: Fix RNDADDTOENTCNT " Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 16/18] ci: %cross-targets: Add powerpc64le-linux-gnu Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 17/18] utils: Fix target-64bit? on powerpc64le-linux Chris Marusich
2021-03-16 6:45 ` [bug#47182] [PATCH 18/18] gnu: sed: Make it build on SELinux-enabled kernels Chris Marusich
2021-03-16 8:30 ` [bug#47182] [PATCH 01/18] gnu: bootstrap: Add support for powerpc64le-linux Chris Marusich
2021-03-16 9:33 ` [bug#47182] [PATCH 00/18] Add support for powerpc64le-linux (wip-ppc64le-for-master) Léo Le Bouter via Guix-patches via
2021-03-17 6:58 ` Chris Marusich
2021-03-17 20:33 ` Christopher Baines
2021-03-18 6:08 ` Chris Marusich
2021-03-24 6:36 ` bug#47182: Merged to master Chris Marusich
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=20210316064511.2891553-3-cmmarusich@gmail.com \
--to=cmmarusich@gmail.com \
--cc=47182@debbugs.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).