From c33100536bd1c88c2e6ff8ef180834a6b5b8e350 Mon Sep 17 00:00:00 2001
* gnu/packages/onc-rpc.scm
(libtirpc/hurd)[arguments]{#:configure-flags}: Copy to ...
(libtirpc)[argument]{#:configure-flags}: ... here and modernise with G-exps
and "guix style".
---
gnu/packages/onc-rpc.scm | 42 ++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 17 deletions(-)
Toggle diff (76 lines)
diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index 873dc54c30..58c469c927 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -26,6 +27,7 @@ (define-module (gnu packages onc-rpc)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
@@ -50,19 +52,25 @@ (define-public libtirpc
"05zf16ilwwkzv4cccaac32nssrj3rg444n9pskiwbgk6y359an14"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--disable-static")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'adjust-netconfig-reference
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* '("man/netconfig.5"
- "man/getnetconfig.3t"
- "man/getnetpath.3t"
- "man/rpc.3t"
- "src/getnetconfig.c"
- "tirpc/netconfig.h")
- (("/etc/netconfig") (string-append (assoc-ref outputs "out")
- "/etc/netconfig"))))))))
+ (list #:configure-flags
+ ;; When cross-building the target system's krb5-config should be used.
+ ;; TODO(core-updates): Simplify by making it unconditional.
+ (if (%current-target-system)
+ #~(list "--disable-static"
+ (string-append "KRB5_CONFIG="
+ #$(this-package-input "mit-krb5")
+ "/bin/krb5-config"))
+ #~'("--disable-static"))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'adjust-netconfig-reference
+ (lambda _
+ (substitute* '("man/netconfig.5"
+ "man/getnetconfig.3t"
+ "man/getnetpath.3t" "man/rpc.3t"
+ "src/getnetconfig.c"
+ "tirpc/netconfig.h")
+ (("/etc/netconfig")
+ (string-append #$output "/etc/netconfig"))))))))
(inputs (list mit-krb5))
(home-page "https://sourceforge.net/projects/libtirpc/")
(synopsis "Transport-independent Sun/ONC RPC implementation")
@@ -81,10 +89,10 @@ (define-public libtirpc/hurd
(arguments
(substitute-keyword-arguments (package-arguments libtirpc)
((#:configure-flags flags ''())
- ;; When cross-building the target system's krb5-config should be used.
- `(list (string-append "ac_cv_prog_KRB5_CONFIG="
- (assoc-ref %build-inputs "mit-krb5")
- "/bin/krb5-config")))))))
+ ;; TODO(core-updates): Shouldn't be needed anymore.
+ #~(list (string-append "ac_cv_prog_KRB5_CONFIG="
+ (assoc-ref %build-inputs "mit-krb5")
+ "/bin/krb5-config")))))))
(define libtirpc/fixed
(package
--
2.37.3