ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 23:46:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: isc-dhcp: Fix cross-compilation.

Browse source 
* gnu/packages/admin.scm (isc-dhcp)[arguments]: Set BUILD_CC in
'fix-bind-cross-compilation' phase.  While at it, make the phase conditional
on %CURRENT-TARGET-SYSTEM.
This commit is contained in:
Marius Bakke 2020-03-11 19:02:46 +01:00
parent 805ac43c94
commit f8cbe98e65
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/admin.scm
View file

@ -18,7 +18,7 @@
;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23@gmail.com>
;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2018, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
@ -809,12 +809,17 @@ (define-public isc-dhcp
(("^RELEASEVER=.*")
(format #f "RELEASEVER=~a\n" ,bind-release-version)))
#t))
(add-before 'configure 'fix-bind-cross-compilation
(lambda _
(substitute* "configure"
(("--host=\\$host")
"--host=$host_alias"))
#t))
,@(if (%current-target-system)
'((add-before 'configure 'fix-bind-cross-compilation
(lambda _
(substitute* "configure"
(("--host=\\$host")
"--host=$host_alias"))
;; BIND needs a native compiler because the DHCP
;; build system uses the built 'gen' executable.
(setenv "BUILD_CC" "gcc")
#t)))
'())
(add-after 'configure 'post-configure
(lambda* (#:key outputs #:allow-other-keys)
;; Point to the right client script, which will be