From owner-freebsd-gnome@FreeBSD.ORG Wed Jun 13 03:33:54 2012 Return-Path: Delivered-To: gnome@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 11B78106564A; Wed, 13 Jun 2012 03:33:54 +0000 (UTC) (envelope-from mezz.freebsd@gmail.com) Received: from mail-gh0-f182.google.com (mail-gh0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id 998E28FC0A; Wed, 13 Jun 2012 03:33:53 +0000 (UTC) Received: by ghbz22 with SMTP id z22so72639ghb.13 for ; Tue, 12 Jun 2012 20:33:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=loObsnql+xM6pkYOklwMPXtSU4Gk5HKa48jivwWNANs=; b=uOWd31nu+YiXx3r+kKXfG466S/Rd7e0fJfeGh5Q4Fzb+vRwiKdPJ28MAh2WoNQo7WU 1XsRcS/EvQjinqYv9oLReoQlahkobbjp8yqVmpgr7aecRVFo1+46iEFH18bRuWdnhNgG a5bMY4D+gph4Sx52b989SPK1Go4QZKTgXnmVnvSEAtLW1a/73kZZDeZPsVDnY5xE2BLt 1sjO4/I1sluIV1Nrb5r7kzj3NUmcZcd3GyzoMQgMZ5TJc9wO2fcmMIIf+pLtZU/BV0RS VXwmO0E3tveCFCEWqsf5+IWRFRiFYlz8mLEOnzxgtaegf27fuO7LqyAoww4VGg9t/B2V qHpA== MIME-Version: 1.0 Received: by 10.101.179.5 with SMTP id g5mr9495653anp.64.1339558426768; Tue, 12 Jun 2012 20:33:46 -0700 (PDT) Received: by 10.101.85.17 with HTTP; Tue, 12 Jun 2012 20:33:46 -0700 (PDT) In-Reply-To: <201206122105.q5CL5ROG017106@gw.catspoiler.org> References: <201205201627.q4KGRscj068314@freefall.freebsd.org> <201206122105.q5CL5ROG017106@gw.catspoiler.org> Date: Tue, 12 Jun 2012 22:33:46 -0500 Message-ID: From: Jeremy Messenger To: Don Lewis Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: gnome@freebsd.org, mezz@freebsd.org Subject: Re: ports/167989: databases/evolution-data-server build fails on FreeBSD 10 with new Heimdal X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Jun 2012 03:33:54 -0000 On Tue, Jun 12, 2012 at 4:05 PM, Don Lewis 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 > +- =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 > +- =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 > =A0+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#include > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 #include > - =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 > +- =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 > +- =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 > =A0+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0#include > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 #include > - =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