diff options
| author | schmonz <schmonz@pkgsrc.org> | 2007-06-02 06:56:06 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2007-06-02 06:56:06 +0000 |
| commit | b267578d80c15bcbad7337c5fd802916f3d5e7b1 (patch) | |
| tree | 07a2e0f4d43bfd1ad767abde4ee3097af3a970d6 /converters/libiconv/Makefile | |
| parent | 22dd28dbd0a5742cdb3dba0012ec0e7a72826590 (diff) | |
| download | pkgsrc-b267578d80c15bcbad7337c5fd802916f3d5e7b1.tar.gz | |
Don't require c99 in USE_LANGUAGES. libiconv builds fine with gcc
2.95.4 on FreeBSD 4.11 without it; with it, pkgsrc wants gcc3-c,
which results in a circular dependency.
The addition of c99 to USE_LANGUAGES appears to have been intended
to benefit IRIX with MIPSPro, so also restore the old behavior of
appending "-c99" to CFLAGS in that case.
Diffstat (limited to 'converters/libiconv/Makefile')
| -rw-r--r-- | converters/libiconv/Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 12b86800867..1c4563bd401 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2007/04/12 10:27:15 tnn Exp $ +# $NetBSD: Makefile,v 1.50 2007/06/02 06:56:06 schmonz Exp $ DISTNAME= libiconv-1.11 CATEGORIES= converters @@ -15,7 +15,7 @@ COMMENT= Character set conversion library PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir -USE_LANGUAGES+= c99 c++ +USE_LANGUAGES+= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= yes @@ -35,6 +35,13 @@ REQD_FILES= ${EGDIR}/charset.alias ${PREFIX}/lib/charset.alias MAKE_ENV+= PAX=${PAX:Q} MAKE_JOBS_SAFE= no # ENOENT(srclib) +.include "../../mk/compiler.mk" + +.if !empty(PKGSRC_COMPILER:Mmipspro*) +CFLAGS+= -c99 +.endif + + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux" || ${OPSYS} == "OSF1" |