mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: boost: Allow compilation on/to GNU/Hurd.
* gnu/packages/boost.scm (boost)[arguments]: In 'configure' phase, patch "#if defined(__MACH__)" to deal with GNU/Hurd.
This commit is contained in:
parent
a279f7c61c
commit
7b7b468ea4
1 changed files with 11 additions and 1 deletions
|
@ -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 @@ (define-module (gnu packages boost)
|
|||
#: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 @@ (define-public boost
|
|||
,(%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
|
||||
|
|
Loading…
Reference in a new issue