mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 19:39:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

REMOVEME gnu: libstdc++: Avoid world rebuild.

Browse source 
* gnu/packages/gcc.scm (make-libstdc++)[arguments]: Restore phases for x86_64.
* gnu/packages/gcc.scm (REMOVEME-make-libstdc++): New procedure.
* gnu/packages/commencement.scm (libstdc++-boot0): Use it.
(make-libstdc++-boot0): Likewise.
(libstdc++): Likewise.

Change-Id: I7ca61e6f5d45bc19db6cc4cb36711f187fd91bf7
This commit is contained in:
Janneke Nieuwenhuizen 2025-01-02 12:09:52 +01:00
parent 50af95b086
commit 05af41997f
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 115 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/commencement.scm
View file

@ -2240,7 +2240,7 @@ exec " gcc "/bin/" program
;; 'Makefile.def' forcefully adds --enable-shared) and thus needs to refer
;; to libstdc++.so. We cannot build libstdc++-5.3 because it relies on
;; C++14 features missing in some of our bootstrap compilers.
(let ((lib (make-libstdc++ gcc-4.9)))
(let ((lib (REMOVEME-make-libstdc++ gcc-4.9)))
(package
(inherit lib)
(source (bootstrap-origin (package-source lib)))
@ -2275,7 +2275,7 @@ exec " gcc "/bin/" program
(define (make-libstdc++-boot0 gcc)
;; GCC >= 7 is needed by architectures which use C++-14 features.
(let ((lib (make-libstdc++ gcc)))
(let ((lib (REMOVEME-make-libstdc++ gcc)))
(package
(inherit lib)
(source (bootstrap-origin (package-source lib)))
@ -3151,7 +3151,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(define libstdc++
;; Intermediate libstdc++ that will allow us to build the final GCC
;; (remember that GCC-BOOT0 cannot build libstdc++.)
(let ((lib (make-libstdc++ gcc-boot0)))
(let ((lib (REMOVEME-make-libstdc++ gcc-boot0)))
(package
(inherit lib)
(source (bootstrap-origin (package-source lib)))

113
gnu/packages/gcc.scm
View file

@ -1060,7 +1060,15 @@ using compilers other than GCC."
(("#if ! defined _GLIBCXX_ZONEINFO_DIR")
"#if __GNU__ || ! defined _GLIBCXX_ZONEINFO_DIR")))))
'())
#$@(if (and (target-x86?) (target-linux?)
#$@(if (and (target-x86-64?) (target-linux?)
(version>=? (package-version gcc) "14"))
#~((add-after 'unpack 'patch-x86_64-linux
(lambda _
(substitute* "libstdc++-v3/src/c++20/tzdb.cc"
(("#if ! defined _GLIBCXX_ZONEINFO_DIR")
"#if __x86_64__ || ! defined _GLIBCXX_ZONEINFO_DIR")))))
'())
#$@(if (and (target-x86-32?) (target-linux?)
(version>=? (package-version gcc) "14"))
#~((add-after 'unpack 'patch-x86_64-linux
(lambda _
@ -1086,6 +1094,109 @@ using compilers other than GCC."
(propagated-inputs '())
(synopsis "GNU C++ standard library")))
(define-public (REMOVEME-make-libstdc++ gcc)
"Return a libstdc++ package based on GCC. The primary use case is when
using compilers other than GCC."
(package
(inherit gcc)
(name "libstdc++")
(arguments
(list
#:out-of-source? #t
#:modules `((srfi srfi-1)
(srfi srfi-26)
,@%default-gnu-modules)
#:phases
#~(modify-phases %standard-phases
#$@(if (version>=? (package-version gcc) "11")
#~((add-after 'unpack 'hide-gcc-headers
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gcc (assoc-ref (or native-inputs inputs)
#$(if (%current-target-system)
"cross-gcc"
"gcc"))))
;; Fix a regression in GCC 11 where the GCC headers
;; shadows glibc headers when building libstdc++. An
;; upstream fix was added in GCC 11.3.0, but it only
;; hides system include directories, not those on
;; CPLUS_INCLUDE_PATH. See discussion at
;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017>
;; and the similar adjustment in GCC-FINAL.
(substitute* "libstdc++-v3/src/c++17/Makefile.in"
(("AM_CXXFLAGS = ")
(string-append #$(if (%current-target-system)
"CROSS_CPLUS_INCLUDE_PATH = "
"CPLUS_INCLUDE_PATH = ")
(string-join
(remove (cut string-prefix? gcc <>)
(string-split
(getenv
#$(if (%current-target-system)
"CROSS_CPLUS_INCLUDE_PATH"
"CPLUS_INCLUDE_PATH"))
#\:))
":")
"\nAM_CXXFLAGS = ")))))))
'())
#$@(let ((version (package-version gcc)))
(if (and (target-ppc64le?)
(version>=? version "11")
(not (version>=? version "12")))
;; TODO: Drop the 'else' branch below on next rebuild
;; cycle.
(if (%current-target-system)
#~((add-after 'unpack 'patch-powerpc ;correct
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(invoke "patch" "--force" "-p1" "-i"
(assoc-ref (or native-inputs inputs)
"powerpc64le-patch")))))
#~((add-after 'unpack 'patch-powerpc ;wrong
(lambda* (#:key inputs #:allow-other-keys)
(invoke "patch" "--force" "-p1" "-i"
(assoc-ref inputs "powerpc64le-patch"))))))
'()))
;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64.
(add-after 'unpack 'fix-rs6000-libdir
(lambda _
(when (file-exists? "gcc/config/rs6000")
(substitute* (find-files "gcc/config/rs6000")
(("/lib64") "/lib")))))
(add-before 'configure 'chdir
(lambda _
(chdir "libstdc++-v3")))
#$@(if (target-hurd64?)
#~((add-after 'unpack 'patch-hurd64
(lambda _
(substitute* "libstdc++-v3/src/c++20/tzdb.cc"
(("#if ! defined _GLIBCXX_ZONEINFO_DIR")
"#if __GNU__ || ! defined _GLIBCXX_ZONEINFO_DIR")))))
'())
#$@(if (and (target-x86?) (target-linux?)
(version>=? (package-version gcc) "14"))
#~((add-after 'unpack 'patch-x86_64-linux
(lambda _
(substitute* "libstdc++-v3/src/c++20/tzdb.cc"
(("#if ! defined _GLIBCXX_ZONEINFO_DIR")
"#if __x86_64__ || ! defined _GLIBCXX_ZONEINFO_DIR")))))
'()))
#:configure-flags '`("--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out")
"/include"))))
(outputs '("out" "debug"))
(inputs '())
(native-inputs
`(,@(if (and (target-ppc64le?)
(let ((version (package-version gcc)))
(and
(version>=? version "11")
(not (version>=? version "12")))))
`(("powerpc64le-patch" ,(search-patch "gcc-11-libstdc++-powerpc.patch")))
'())))
(propagated-inputs '())
(synopsis "GNU C++ standard library")))
(define libstdc++
;; Libstdc++ matching the default GCC.
(make-libstdc++ gcc))