Attachment 226882 Details for Bug 257566 – v1 (use "git am")

[patch] v1 (use "git am")

0001-security-cyrus-sasl2-respect-CC.patch (text/plain), 2.44 KB, created by Evgenii Khramtsov on 2021-08-02 16:34:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgenii Khramtsov

Created: 2021-08-02 16:34:21 UTC

Size: 2.44 KB

patch

obsolete

>From 53d41c7883627d25f98081f11311e698670a84ac Mon Sep 17 00:00:00 2001
>From: Evgeniy Khramtsov <evgeniy@khramtsov.org>
>Date: Sun, 1 Aug 2021 23:53:19 +0300
>Subject: [PATCH] security/cyrus-sasl2: respect CC
>
>configure:4847: checking for gcc
>configure:4877: result: no
>configure:4940: checking for cc
>configure:4987: result: no
>configure:5043: checking for cl.exe
>configure:5073: result: no
>configure:5097: error: in `/usr/local/poudriere/ports/ei/security/cyrus-sasl2/work/cyrus-sasl
>-2.1.27':
>configure:5100: error: no acceptable C compiler found in $PATH
>
>PR: XXXXXX
>---
> security/cyrus-sasl2/files/patch-configure | 19 ++++++++++++++-----
> 1 file changed, 14 insertions(+), 5 deletions(-)
>
>diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
>index befb3bc18e8b..4765b80e0e81 100644
>--- a/security/cyrus-sasl2/files/patch-configure
>+++ b/security/cyrus-sasl2/files/patch-configure
>@@ -1,6 +1,15 @@
>---- configure.orig	2017-11-30 21:15:59 UTC
>+--- configure.orig	2018-10-09 14:58:13 UTC
> +++ configure
>-@@ -15415,6 +15415,8 @@ else
>+@@ -3909,7 +3909,7 @@ fi
>+ 
>+ fi
>+ 
>+-
>++CC_FOR_BUILD="${CC}"
>+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
>+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
>+ as_fn_error $? "no acceptable C compiler found in \$PATH
>+@@ -15417,6 +15417,8 @@ else
>    SASLAUTHD_TRUE='#'
>    SASLAUTHD_FALSE=
>  fi
>@@ -9,7 +18,7 @@
>  
>  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if I should include saslauthd" >&5
>  $as_echo_n "checking if I should include saslauthd... " >&6; }
>-@@ -17029,6 +17031,7 @@ fi
>+@@ -17031,6 +17033,7 @@ fi
>       gssapi_dir="${gssapi}/lib"
>       GSSAPIBASE_LIBS="-L$gssapi_dir"
>       GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir"
>@@ -17,7 +26,7 @@
>    else
>       # FIXME: This is only used for building cyrus, and then only as
>       # a real hack.  it needs to be fixed.
>-@@ -17048,7 +17051,7 @@ if ${ac_cv_lib_gssapi_gss_unwrap+:} fals
>+@@ -17050,7 +17053,7 @@ if ${ac_cv_lib_gssapi_gss_unwrap+:} false; then :
>    $as_echo_n "(cached) " >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
>@@ -26,7 +35,7 @@
>  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>  /* end confdefs.h.  */
>  
>-@@ -17308,7 +17311,7 @@ fi
>+@@ -17310,7 +17313,7 @@ fi
>      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
>    elif test "$gss_impl" = "heimdal"; then
>      CPPFLAGS="$CPPFLAGS"
>-- 
>2.32.0
>

Flags:

2khramtsov: maintainer-approval? (ume)

Actions: View | Diff

Attachments on bug 257566: 226882