ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 20:49:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: gcc-4.7: On powerpc64le, fix /lib64 references.

Browse source 
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.
This commit is contained in:
Chris Marusich 2021-02-06 16:29:40 -08:00
parent fc7cf0c1ec
commit cac88b28b8
No known key found for this signature in database
GPG key ID: DD409A15D822469D
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gnu/packages/gcc.scm
View file

@ -3,13 +3,14 @@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; 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 © 2016 Carlos Sánchez de La Lama <csanchezdll@gmail.com>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz> ;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -273,6 +274,14 @@ (define-public gcc-4.7
~a" ~a"
libc line)))) 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. ;; Don't retain a dependency on the build-time sed.
(substitute* "fixincludes/fixincl.x" (substitute* "fixincludes/fixincl.x"
(("static char const sed_cmd_z\\[\\] =.*;") (("static char const sed_cmd_z\\[\\] =.*;")
@ -598,12 +607,27 @@ (define-public (make-libstdc++ gcc)
(name "libstdc++") (name "libstdc++")
(arguments (arguments
`(#:out-of-source? #t `(#:out-of-source? #t
#:phases (alist-cons-before #:phases
'configure 'chdir ;; TODO: Use the target-powerpc arm for everyone.
(lambda _ ,(if (target-powerpc?)
(chdir "libstdc++-v3") `(modify-phases %standard-phases
#t) ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
%standard-phases) (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" #:configure-flags `("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir=" ,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")