ports/167989: databases/evolution-data-server build fails on FreeBSD 10 with new Heimdal

[Jeremy Messenger]

On Tue, Jun 12, 2012 at 4:05 PM, Don Lewis <truckman at freebsd.org> wrote:
> On 20 May, mezz at FreeBSD.org wrote:
>> Synopsis: databases/evolution-data-server build fails on FreeBSD 10 with new Heimdal
>>
>> State-Changed-From-To: open->closed
>> State-Changed-By: mezz
>> State-Changed-When: Sun May 20 16:27:40 UTC 2012
>> State-Changed-Why:
>> Committed, thanks!
>>
>> http://www.freebsd.org/cgi/query-pr.cgi?pr=167989
>
> The patch to the configure script didn't work for me.  The problem is
> that the extra include files weren't pulled in because they were inside
> a #ifdef/#endif block that referenced an undefined symbol.  For some
> reason this sort of thing is done in a number of other places in
> configure, but it works there because they only include the header being
> tested, which ac_fn_c_check_header_compile also includes
> unconditionally.
>
> The following patch to the patch works for me:

Go ahead commit it. Thanks!

Cheers,
Mezz


> Index: files/patch-configure
> ===================================================================
> RCS file: /home/ncvs/ports/databases/evolution-data-server/files/patch-configure,v
> retrieving revision 1.13
> diff -u -r1.13 patch-configure
> --- files/patch-configure       20 May 2012 16:27:31 -0000      1.13
> +++ files/patch-configure       12 Jun 2012 15:40:32 -0000
> @@ -1,5 +1,5 @@
> ---- configure.orig     2012-05-19 23:39:42.000000000 -0500
> -+++ configure  2012-05-19 23:42:47.000000000 -0500
> +--- configure.orig     2010-11-14 22:59:14.000000000 -0800
> ++++ configure  2012-06-12 08:40:11.000000000 -0700
>  @@ -14174,6 +14174,14 @@
>  $as_echo "#define _WIN32_WINNT 0x501" >>confdefs.h
>
> @@ -15,21 +15,27 @@
>  *)
>        os_win32='no'
>        NO_UNDEFINED=''
> -@@ -16196,6 +16204,8 @@
> +@@ -16195,9 +16203,8 @@
> + fi
>
>
> -       ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "     #if HAVE_ET_COM_ERR_H
> -+                      #include <stdio.h>
> +-      ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "     #if HAVE_ET_COM_ERR_H
> +-                      #include <com_err.h>
> +-                      #endif
> ++      ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "     #include <stdio.h>
>  +                      #include <stdarg.h>
> -                       #include <com_err.h>
> -                       #endif
>
> -@@ -16208,6 +16218,8 @@
> + "
> + if test "x$ac_cv_header_et_com_err_h" = x""yes; then :
> +@@ -16207,9 +16214,8 @@
> + fi
>
>
> -       ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "   #if HAVE_COM_ERR_H
> -+                      #include <stdio.h>
> +-      ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "   #if HAVE_COM_ERR_H
> +-                      #include <com_err.h>
> +-                      #endif
> ++      ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "   #include <stdio.h>
>  +                      #include <stdarg.h>
> -                       #include <com_err.h>
> -                       #endif
>
> + "
> + if test "x$ac_cv_header_com_err_h" = x""yes; then :
>



-- 
mezz.freebsd at gmail.com - mezz at FreeBSD.org
FreeBSD GNOME Team
http://www.FreeBSD.org/gnome/ - gnome at FreeBSD.org