Merge pull request #2320 from dm0-/fix-cross-sssd

sys-auth/sssd: fix krb5-config detection
This commit is contained in:
David Michael 2016-12-14 16:01:56 -08:00 committed by GitHub
commit cd0969ec59
2 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 79c0ed5d08fdcc093baef155a118829caf4af63b Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Wed, 14 Dec 2016 15:08:28 -0800
Subject: [PATCH] BUILD: Find a host-prefixed krb5-config when cross-compiling
---
src/external/krb5.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/external/krb5.m4 b/src/external/krb5.m4
index 8fc9096..b844c2f 100644
--- a/src/external/krb5.m4
+++ b/src/external/krb5.m4
@@ -9,7 +9,7 @@ if test x$KRB5_CFLAGS != x; then
KRB5_PASSED_CFLAGS=$KRB5_CFLAGS
fi
-AC_PATH_PROG(KRB5_CONFIG, krb5-config)
+AC_PATH_TOOL(KRB5_CONFIG, krb5-config)
AC_MSG_CHECKING(for working krb5-config)
if test -x "$KRB5_CONFIG"; then
KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--
2.7.4

View File

@ -80,6 +80,8 @@ pkg_setup(){
} }
src_prepare() { src_prepare() {
epatch "${FILESDIR}"/sssd-1.14.2-fix-krb5-config.patch
eautoreconf eautoreconf
multilib_copy_sources multilib_copy_sources
@ -124,7 +126,6 @@ multilib_src_configure() {
--with-initscript="sysv" --with-initscript="sysv"
--without-python2-bindings --without-python2-bindings
--without-python3-bindings --without-python3-bindings
KRB5_CONFIG=${ROOT}/usr/bin/${CHOST}-krb5-config
) )
if ! multilib_is_native_abi; then if ! multilib_is_native_abi; then