Re: PR/32945 CVS commit: pkgsrc/devel/gettext-lib

[Gilles Dauphin <Gilles.Dauphin%enst.fr@localhost>]

The following reply was made to PR pkg/32945; it has been noted by GNATS.

From: Gilles Dauphin <Gilles.Dauphin%enst.fr@localhost>
To: joerg%NetBSD.org@localhost, gnats-admin%NetBSD.org@localhost, 
alex%foxybanana.com@localhost,
        gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: PR/32945 CVS commit: pkgsrc/devel/gettext-lib
Date: Wed, 5 Jul 2006 10:56:17 +0200 (CEST)

 > 
 > The following reply was made to PR pkg/32945; it has been noted by GNATS.
 > 
 > From: Min Sik Kim <minskim%netbsd.org@localhost>
 > To: gnats-bugs%NetBSD.org@localhost
 > Cc: 
 > Subject: PR/32945 CVS commit: pkgsrc/devel/gettext-lib
 > Date: Mon,  3 Jul 2006 19:06:13 +0000 (UTC)
 > 
 >  Module Name:        pkgsrc
 >  Committed By:       minskim
 >  Date:               Mon Jul  3 19:06:13 UTC 2006
 >  
 >  Modified Files:
 >      pkgsrc/devel/gettext-lib: Makefile distinfo
 >  Added Files:
 >      pkgsrc/devel/gettext-lib/patches: patch-aa
 >  
 >  Log Message:
 >  Make sure that locale_charset is defined only once.  Otherwise, it may cause
 >  a link error on Darwin.  The patch was adapted from the one submitted in
 >  PR pkg/32723.  It also fixes PR pkg/32945.
 >  
 >  Bump PKGREVISION.
 
 This patch break gettext-lib on Solaris.
 locale_charset is *not* define in the native iconv library.
 Original patch in PR 32945 seems good (#ifndef __APPLE__ ...)
 here is the patch i want and maybe use CFLAGS.Darwin+= -D__LOCALE_CHARSET__
 in Makefile
 
 $NetBSD: patch-aa,v 1.3 2006/07/03 19:06:13 minskim Exp $
 
 --- intl/localcharset.c.orig    2005-05-20 13:07:51.000000000 -0700
 +++ intl/localcharset.c
 @@ -23,6 +23,13 @@
  # include <config.h>
  #endif
 
 +#ifndef __LOCALE_CHARSET__
 +
 +/* Provide our variant only if we don't use the systems iconv library. This is
 + * consistant with the usage in loadmsgcat.c and prevents us from relying on
 + * link-time symbol resolution. 
 + */
 +
  /* Specification.  */
  #include "localcharset.h"
 
 @@ -407,3 +414,4 @@ locale_charset ()
 
    return codeset;
  }
 +#endif