guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/13: gnu: libtirpc: Keep reference to mit-krb5 when cross-compiling.


From: guix-commits
Subject: 04/13: gnu: libtirpc: Keep reference to mit-krb5 when cross-compiling.
Date: Mon, 16 Oct 2023 05:39:58 -0400 (EDT)

efraim pushed a commit to branch core-updates
in repository guix.

commit 637bff317049c51c93a7cf1ac511519cb86f8243
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Oct 15 13:04:04 2023 +0300

    gnu: libtirpc: Keep reference to mit-krb5 when cross-compiling.
    
    * gnu/packages/onc-roc.scm (libtirpc)[arguments]: When cross-compiling
    adjust the pkg-config file to retain a reference to mit-krb5.
---
 gnu/packages/onc-rpc.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm
index afeb26331c..0c87c02a0b 100644
--- a/gnu/packages/onc-rpc.scm
+++ b/gnu/packages/onc-rpc.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2022 Zheng Junjie <873216071@qq.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -64,7 +64,17 @@
                             "src/getnetconfig.c"
                             "tirpc/netconfig.h")
                (("/etc/netconfig") (string-append (assoc-ref outputs "out")
-                                                  "/etc/netconfig"))))))))
+                                                  "/etc/netconfig")))))
+         ,@(if (%current-target-system)
+             `((add-after 'unpack 'adjust-pkg-config
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "libtirpc.pc.in"
+                     (("-ltirpc")
+                      (string-append "-ltirpc"
+                                     " -L" (dirname (search-input-file
+                                                      inputs 
"/lib/libkrb5.so"))
+                                     " -lkrb5"))))))
+             `()))))
     (native-inputs (list mit-krb5)) ;; for cross-compilation
     (inputs (list mit-krb5))
     (home-page "https://sourceforge.net/projects/libtirpc/";)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]