[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: boost-for-mysql: Fix building.
From: |
guix-commits |
Subject: |
branch master updated: gnu: boost-for-mysql: Fix building. |
Date: |
Thu, 21 May 2020 04:36:43 -0400 |
This is an automated email from the git hooks/post-receive script.
efraim pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new a082856 gnu: boost-for-mysql: Fix building.
a082856 is described below
commit a0828560b58f6b6c8b400caf0ceee396abc7d4c0
Author: Efraim Flashner <address@hidden>
AuthorDate: Thu May 21 11:30:50 2020 +0300
gnu: boost-for-mysql: Fix building.
Co-authored with Jonathan Brielmaier <address@hidden>
* gnu/packages/boost.scm (boost-for-mysql)[arguments]: Replace inherited
'configure, phase remove references to python and update the substitute
regex for boost-1.59. Absorb 'more-bin-sh-patching into 'configure.Adjust
make-flags to always pass '--without-python'.
[native-inputs]: Remove python.
---
gnu/packages/boost.scm | 41 +++++++++++++++++++++++++++++++++++------
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index 2f2ca28..d28c58d 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -13,6 +13,7 @@
;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;; Copyright © 2019, 2020 Giacomo Leidi <address@hidden>
;;; Copyright © 2020 Marius Bakke <address@hidden>
+;;; Copyright © 2020 Jonathan Brielmaier <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -241,12 +242,40 @@ across a broad spectrum of applications.")
(arguments (substitute-keyword-arguments (package-arguments boost)
((#:phases phases)
`(modify-phases ,phases
- ;; This was removed after boost-1.67.
- (add-before 'configure 'more-bin-sh-patching
- (lambda _
- (substitute* "tools/build/doc/bjam.qbk"
- (("/bin/sh") (which "sh")))))
- (delete 'provide-libboost_python)))))
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((icu (assoc-ref inputs "icu4c"))
+ (out (assoc-ref outputs "out")))
+ (substitute* (append
+ (find-files "tools/build/src/engine/"
"execunix\\.c.*")
+ '("libs/config/configure"
+ "libs/spirit/classic/phoenix/test/runtest.sh"
+ "tools/build/doc/bjam.qbk"
+ "tools/build/src/engine/Jambase"))
+ (("/bin/sh") (which "sh")))
+
+ (setenv "SHELL" (which "sh"))
+ (setenv "CONFIG_SHELL" (which "sh"))
+
+ ,@(if (%current-target-system)
+ `((call-with-output-file "user-config.jam"
+ (lambda (port)
+ (format port
+ "using gcc : cross : ~a-c++ ;"
+ ,(%current-target-system)))))
+ '())
+
+ (invoke "./bootstrap.sh"
+ (string-append "--prefix=" out)
+ ;; Auto-detection looks for ICU only in traditional
+ ;; install locations.
+ (string-append "--with-icu=" icu)
+ "--with-toolset=gcc"))))
+ (delete 'provide-libboost_python)))
+ ((#:make-flags make-flags)
+ `(cons* "--without-python" ,make-flags))))
+ (native-inputs
+ (alist-delete "python" (package-native-inputs boost)))
(properties '((hidden? . #t)))))
(define-public boost-sync
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: boost-for-mysql: Fix building.,
guix-commits <=