pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/converters/libiconv Don't require c99 in USE_LANGUAGES...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/161b6701ae15
branches:  trunk
changeset: 529368:161b6701ae15
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sat Jun 02 06:56:06 2007 +0000

description:
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:

 converters/libiconv/Makefile |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r c0d0d6f453fc -r 161b6701ae15 converters/libiconv/Makefile
--- a/converters/libiconv/Makefile      Sat Jun 02 02:36:57 2007 +0000
+++ b/converters/libiconv/Makefile      Sat Jun 02 06:56:06 2007 +0000
@@ -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 @@
 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 @@
 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"



Home | Main Index | Thread Index | Old Index