[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: libstdc++-boot0: Improve gcc-wrapper workaround.
From: |
guix-commits |
Subject: |
04/06: gnu: libstdc++-boot0: Improve gcc-wrapper workaround. |
Date: |
Sat, 24 Nov 2018 02:20:27 -0500 (EST) |
janneke pushed a commit to branch core-updates-next
in repository guix.
commit a6facf94828b7215566c724822f00feee36f60a9
Author: Marius Bakke <address@hidden>
Date: Wed Oct 3 17:13:06 2018 +0200
gnu: libstdc++-boot0: Improve gcc-wrapper workaround.
* gnu/packages/commencement.scm (libstdc++-boot0): Adjust the configure
script
instead of copying libstdc++.so from %BOOT0-INPUTS.
---
gnu/packages/commencement.scm | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 015211f..467a158 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1641,17 +1641,13 @@ exec " gcc "/bin/" program
(substitute-keyword-arguments (package-arguments lib)
((#:phases phases)
`(modify-phases ,phases
- ;; FIXME: why doesn't this package build
libstdc++.so.6.0.20,
- ;; when gcc-mesboot builds it fine?
- ;; libtool: install:
/gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install -c
.libs/libstdc++.so.6.0.20
/gnu/store/np5pmdlwfin3vmqk88chh0fgs0ncki79-libstdc++-boot0-4.8.5/lib/libstdc++.so.6.0.20
- ;;
/gnu/store/7swwdnq02lqk4xkd8740fxdj1h4va38l-bootstrap-binaries-0/bin/install:
cannot stat '.libs/libstdc++.so.6.0.20': No such file or directory
- (add-after 'build 'copy-libstdc++-
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((gcc (assoc-ref %build-inputs "gcc"))
- (out (assoc-ref outputs "out")))
- (copy-file (string-append gcc
"/lib/libstdc++.so.6.0.20")
- (string-append
"src/.libs/libstdc++.so.6.0.20"))
- #t)))))))
+ (add-after 'unpack 'workaround-wrapper-bug
+ ;; XXX: The crude gcc-cross-wrapper causes "g++ -v" to
+ ;; fail, which in turn confuses the configure script.
+ (lambda _
+ (substitute* "libstdc++-v3/configure"
+ (("g\\+\\+ -v") "true"))
+ #t))))))
(_ (package-arguments lib)))))
(inputs (%boot0-inputs))
(native-inputs '()))))
- branch core-updates-next updated (d9ed0a4 -> 4ae7dc7), guix-commits, 2018/11/24
- 06/06: gnu: Remove duplicate linux-libre-headers package from bootstrap inputs., guix-commits, 2018/11/24
- 05/06: gnu: gcc-boot0: Improve gcc-wrapper workarounds., guix-commits, 2018/11/24
- 03/06: gnu: Remove gcc-for-libstdc++., guix-commits, 2018/11/24
- 02/06: doc: Update for bootstrap-mescc-tools change., guix-commits, 2018/11/24
- 01/06: bootstrap: Force i686-linux for bootstrap-tarballs., guix-commits, 2018/11/24
- 04/06: gnu: libstdc++-boot0: Improve gcc-wrapper workaround.,
guix-commits <=