diff options
| author | Marius Bakke <marius@gnu.org> | 2020-10-13 23:39:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-10-13 23:39:27 +0200 |
| commit | f7175626ffce578be1bc6df4916a129f86557872 (patch) | |
| tree | 2eb0040522f2883764b3e09dc36595d68eeb14c1 /gnu/packages/boost.scm | |
| parent | 2b6ecdf41a09ab9ecae06d7c537583a2f0f28efc (diff) | |
| parent | e8c5533d26b4441c96e9ae92350efcb24d787c4b (diff) | |
| download | guix-f7175626ffce578be1bc6df4916a129f86557872.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/boost.scm')
| -rw-r--r-- | gnu/packages/boost.scm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index 6a08b0d6c7..b1ab8a4ec9 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2015, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> @@ -40,6 +40,7 @@ #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages hurd) #:use-module (gnu packages icu4c) #:use-module (gnu packages perl) #:use-module (gnu packages python) @@ -138,6 +139,15 @@ ,(%current-target-system))))) '()) + ;; Change an #ifdef __MACH__ that really targets macOS. + ;; TODO: Inline this on the next rebuild cycle. + ,@(if (hurd-target?) + '((substitute* "boost/test/utils/timer.hpp" + (("defined\\(__MACH__\\)") + "(defined __MACH__ && !defined __GNU__)")) + #t) + '()) + (invoke "./bootstrap.sh" (string-append "--prefix=" out) ;; Auto-detection looks for ICU only in traditional |