me
/
guix
Archived
1
0
Fork 0
Code

gnu: shadow: Fix cross-compilation. 

* gnu/packages/admin.scm (shadow)[arguments] <set-nscd-file-name>: Refer
to "cross-libc" when cross-compiling.
master
Ludovic Courtès 2017-07-11 22:40:27 +02:00
parent e4015e570c
commit ce6223e68e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/admin.scm
View File

@ -306,7 +306,7 @@ hostname.")
"0hdpai78n63l3v3fgr3kkiqzhd0awrpfnnzz4mf7lmxdh61qb37w")))) "0hdpai78n63l3v3fgr3kkiqzhd0awrpfnnzz4mf7lmxdh61qb37w"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(;; Assume System V `setpgrp (void)', which is the default on GNU `(;; Assume System V `setpgrp (void)', which is the default on GNU
;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.) ;; variants (`AC_FUNC_SETPGRP' is not cross-compilation capable.)
#:configure-flags #:configure-flags
'("--with-libpam" "ac_cv_func_setpgrp_void=yes") '("--with-libpam" "ac_cv_func_setpgrp_void=yes")
@ -316,7 +316,10 @@ hostname.")
(add-before 'build 'set-nscd-file-name (add-before 'build 'set-nscd-file-name
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Use the right file name for nscd. ;; Use the right file name for nscd.
(let ((libc (assoc-ref inputs "libc"))) (let ((libc (assoc-ref inputs
,(if (%current-target-system)
"cross-libc"
"libc"))))
(substitute* "lib/nscd.c" (substitute* "lib/nscd.c"
(("/usr/sbin/nscd") (("/usr/sbin/nscd")
(string-append libc "/sbin/nscd")))))) (string-append libc "/sbin/nscd"))))))