Date: Tue, 12 Jun 2012 22:33:46 -0500 From: Jeremy Messenger <mezz.freebsd@gmail.com> To: Don Lewis <truckman@freebsd.org> Cc: gnome@freebsd.org, mezz@freebsd.org Subject: Re: ports/167989: databases/evolution-data-server build fails on FreeBSD 10 with new Heimdal Message-ID: <CADLFttdRbQrLirXc6OAvs=a1h4480Hdz81tsadipc0MnkMSGcw@mail.gmail.com> In-Reply-To: <201206122105.q5CL5ROG017106@gw.catspoiler.org> References: <201205201627.q4KGRscj068314@freefall.freebsd.org> <201206122105.q5CL5ROG017106@gw.catspoiler.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jun 12, 2012 at 4:05 PM, Don Lewis <truckman@freebsd.org> wrote: > On 20 May, mezz@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=3D167989 > > The patch to the configure script didn't work for me. =A0The problem is > that the extra include files weren't pulled in because they were inside > a #ifdef/#endif block that referenced an undefined symbol. =A0For 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 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/ncvs/ports/databases/evolution-data-server/files/patch-co= nfigure,v > retrieving revision 1.13 > diff -u -r1.13 patch-configure > --- files/patch-configure =A0 =A0 =A0 20 May 2012 16:27:31 -0000 =A0 =A0 = =A01.13 > +++ files/patch-configure =A0 =A0 =A0 12 Jun 2012 15:40:32 -0000 > @@ -1,5 +1,5 @@ > ---- configure.orig =A0 =A0 2012-05-19 23:39:42.000000000 -0500 > -+++ configure =A02012-05-19 23:42:47.000000000 -0500 > +--- configure.orig =A0 =A0 2010-11-14 22:59:14.000000000 -0800 > ++++ configure =A02012-06-12 08:40:11.000000000 -0700 > =A0@@ -14174,6 +14174,14 @@ > =A0$as_echo "#define _WIN32_WINNT 0x501" >>confdefs.h > > @@ -15,21 +15,27 @@ > =A0*) > =A0 =A0 =A0 =A0os_win32=3D'no' > =A0 =A0 =A0 =A0NO_UNDEFINED=3D'' > -@@ -16196,6 +16204,8 @@ > +@@ -16195,9 +16203,8 @@ > + fi > > > - =A0 =A0 =A0 ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_c= v_header_et_com_err_h" " =A0 =A0 #if HAVE_ET_COM_ERR_H > -+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#include <stdio.h> > +- =A0 =A0 =A0ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_c= v_header_et_com_err_h" " =A0 =A0 #if HAVE_ET_COM_ERR_H > +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#include <com_err.h> > +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#endif > ++ =A0 =A0 =A0ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_c= v_header_et_com_err_h" " =A0 =A0 #include <stdio.h> > =A0+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#include <stdarg.h> > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 #include <com_err.h> > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 #endif > > -@@ -16208,6 +16218,8 @@ > + " > + if test "x$ac_cv_header_et_com_err_h" =3D x""yes; then : > +@@ -16207,9 +16214,8 @@ > + fi > > > - =A0 =A0 =A0 ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_h= eader_com_err_h" " =A0 #if HAVE_COM_ERR_H > -+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#include <stdio.h> > +- =A0 =A0 =A0ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_h= eader_com_err_h" " =A0 #if HAVE_COM_ERR_H > +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#include <com_err.h> > +- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#endif > ++ =A0 =A0 =A0ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_h= eader_com_err_h" " =A0 #include <stdio.h> > =A0+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#include <stdarg.h> > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 #include <com_err.h> > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 #endif > > + " > + if test "x$ac_cv_header_com_err_h" =3D x""yes; then : > --=20 mezz.freebsd@gmail.com - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CADLFttdRbQrLirXc6OAvs=a1h4480Hdz81tsadipc0MnkMSGcw>