[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#32953] [PATCH core-updates-next 2/8] gnu: libstdc++-boot0: Improve
From: |
Marius Bakke |
Subject: |
[bug#32953] [PATCH core-updates-next 2/8] gnu: libstdc++-boot0: Improve gcc-wrapper workaround. |
Date: |
Sat, 6 Oct 2018 15:16:33 +0200 |
* 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 46d2a4629..c4f112578 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1720,17 +1720,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 '()))))
--
2.19.0
- [bug#32953] [PATCH core-updates-next 0/8] Use GCC7 as the default compiler., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 1/8] gnu: Remove gcc-for-libstdc++., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 4/8] gnu: Remove duplicate linux-libre-headers package from bootstrap inputs., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 3/8] gnu: gcc-boot0: Improve gcc-wrapper workarounds., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 6/8] gnu: python: Fix FTBFS with GCC >= 6., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 7/8] gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 2/8] gnu: libstdc++-boot0: Improve gcc-wrapper workaround.,
Marius Bakke <=
- [bug#32953] [PATCH core-updates-next 5/8] gnu: Use GCC 7 as the default compiler., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 8/8] gnu: cppunit: Update to 1.14.0., Marius Bakke, 2018/10/06
- [bug#32953] [PATCH core-updates-next 0/8] Use GCC7 as the default compiler., Marius Bakke, 2018/10/06