pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Instead of setting compiler flags in each package if i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d5bcff56aafa
branches: trunk
changeset: 522097:d5bcff56aafa
user: jschauma <jschauma%pkgsrc.org@localhost>
date: Sat Dec 02 22:32:59 2006 +0000
description:
Instead of setting compiler flags in each package if it uses C99,
allow USE_LANGUAGES+=c99 and let gcc and mipspro do the right thing.
May need to be reviewed/added for other compilers.
ok rillig@
diffstat:
converters/libiconv/Makefile | 9 ++-------
databases/shared-mime-info/Makefile | 9 ++-------
devel/atk/Makefile | 9 ++-------
devel/glib2/Makefile | 10 ++--------
devel/gmp/Makefile | 10 ++--------
graphics/ImageMagick/Makefile | 10 ++--------
graphics/cairo/Makefile | 9 ++-------
graphics/glitz/Makefile | 9 ++-------
graphics/jasper/Makefile | 9 ++-------
mk/compiler.mk | 6 +++---
mk/compiler/gcc.mk | 6 +++++-
mk/compiler/mipspro.mk | 6 +++++-
net/tor/Makefile | 7 ++-----
print/ghostscript-gnu/Makefile | 9 ++-------
x11/gtk/Makefile | 9 ++-------
15 files changed, 37 insertions(+), 90 deletions(-)
diffs (truncated from 417 to 300 lines):
diff -r 8024be235196 -r d5bcff56aafa converters/libiconv/Makefile
--- a/converters/libiconv/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/converters/libiconv/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/11/14 13:55:34 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2006/12/02 22:33:00 jschauma Exp $
DISTNAME= libiconv-1.10
PKGREVISION= 3
@@ -16,6 +16,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
PKG_DESTDIR_SUPPORT= user-destdir
+USE_LANGUAGES+= c99
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -32,12 +33,6 @@
MAKE_ENV+= PAX=${PAX:Q}
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+= -c99
-.endif
-
# remove any existing charset.alias; if it already exists, libiconv does
# not overwrite it, and older versions of libiconv wrote incorrect
# charset.alias files, which were not removed during deinstall since
diff -r 8024be235196 -r d5bcff56aafa databases/shared-mime-info/Makefile
--- a/databases/shared-mime-info/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/databases/shared-mime-info/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/10/04 20:53:46 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2006/12/02 22:33:00 jschauma Exp $
#
DISTNAME= shared-mime-info-0.19
@@ -12,6 +12,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
+USE_LANGUAGES+= c99
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_TOOLS+= gmake intltool msgfmt pkg-config
@@ -22,12 +23,6 @@
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+= -c99
-.endif
-
FILES_SUBST+= MIMEDB_PATH="${PREFIX}/share/mime"
FILES_SUBST+= UPDATE_MIMEDB="${PREFIX}/bin/update-mime-database"
diff -r 8024be235196 -r d5bcff56aafa devel/atk/Makefile
--- a/devel/atk/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/devel/atk/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/10/17 16:51:42 drochner Exp $
+# $NetBSD: Makefile,v 1.58 2006/12/02 22:32:59 jschauma Exp $
#
DISTNAME= atk-1.12.3
@@ -16,6 +16,7 @@
USE_TOOLS+= gmake pkg-config msgfmt
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
+USE_LANGUAGES+= c99
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= atk.pc.in
@@ -27,12 +28,6 @@
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+= -c99
-.endif
-
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff -r 8024be235196 -r d5bcff56aafa devel/glib2/Makefile
--- a/devel/glib2/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/devel/glib2/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/11/13 18:34:38 drochner Exp $
+# $NetBSD: Makefile,v 1.110 2006/12/02 22:32:59 jschauma Exp $
DISTNAME= glib-2.12.4
PKGNAME= ${DISTNAME:S/glib/glib2/}
@@ -18,7 +18,7 @@
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake msgfmt perl:run pkg-config
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++ c99
USE_LIBTOOL= yes
TEST_TARGET= check
@@ -54,12 +54,6 @@
CPPFLAGS+= -DPKGLOCALEDIR="\"${PKGLOCALEDIR}\""
CPPFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+= -c99
-.endif
-
.if ${OPSYS} == "FreeBSD"
SUBST_CLASSES+= thr
diff -r 8024be235196 -r d5bcff56aafa devel/gmp/Makefile
--- a/devel/gmp/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/devel/gmp/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/10/22 19:49:07 schwarz Exp $
+# $NetBSD: Makefile,v 1.41 2006/12/02 22:32:59 jschauma Exp $
DISTNAME= gmp-4.1.4
PKGREVISION= 1
@@ -12,7 +12,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++ c99
USE_TOOLS+= gm4
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -26,12 +26,6 @@
ABI= o32
.endif
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro)
-CFLAGS+= -c99
-.endif
-
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
# The configure script thinks gcc 2.95 for ARM is too buggy to use.
GCC_REQD+= 3.0
diff -r 8024be235196 -r d5bcff56aafa graphics/ImageMagick/Makefile
--- a/graphics/ImageMagick/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/graphics/ImageMagick/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2006/11/30 22:55:31 joerg Exp $
+# $NetBSD: Makefile,v 1.147 2006/12/02 22:32:59 jschauma Exp $
.include "Makefile.common"
@@ -13,7 +13,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++ c99
USE_LIBTOOL= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
@@ -44,12 +44,6 @@
# WMF linkage is currently broke, since libMagick would need symbols from libWand
CONFIGURE_ARGS+= --without-wmf
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+= -c99
-.endif
-
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
diff -r 8024be235196 -r d5bcff56aafa graphics/cairo/Makefile
--- a/graphics/cairo/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/graphics/cairo/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/11/09 20:57:40 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2006/12/02 22:32:59 jschauma Exp $
DISTNAME= cairo-1.2.6
CATEGORIES= graphics
@@ -10,6 +10,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
+USE_LANGUAGES+= c99
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_TOOLS+= pkg-config
@@ -32,12 +33,6 @@
BUILDLINK_API_DEPENDS.glitz+= glitz>=0.5.1
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+= -c99
-.endif
-
# For snprintf()
CPPFLAGS.SunOS+= -D__EXTENSIONS__
diff -r 8024be235196 -r d5bcff56aafa graphics/glitz/Makefile
--- a/graphics/glitz/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/graphics/glitz/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/11/05 17:23:44 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/02 22:32:59 jschauma Exp $
DISTNAME= glitz-0.5.6
PKGREVISION= 2
@@ -11,6 +11,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
+USE_LANGUAGES+= c99
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= src/agl/glitz-agl.pc.in src/glx/glitz-glx.pc.in \
@@ -23,12 +24,6 @@
PLIST_SUBST+= AGL="@comment "
.endif
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+= -c99
-.endif
-
.include "options.mk"
.include "../../mk/pthread.buildlink3.mk"
diff -r 8024be235196 -r d5bcff56aafa graphics/jasper/Makefile
--- a/graphics/jasper/Makefile Sat Dec 02 19:15:13 2006 +0000
+++ b/graphics/jasper/Makefile Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:09:34 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/12/02 22:32:59 jschauma Exp $
#
DISTNAME= jasper-1.701.0
@@ -14,15 +14,10 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
+USE_LANGUAGES+= c99
USE_LIBTOOL= YES
CONFIGURE_ARGS+= --enable-shared --without-x --disable-opengl
-.include "../../mk/compiler.mk"
-
-.if !empty(PKGSRC_COMPILER:Mmipspro*)
-CFLAGS+= -c99
-.endif
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jasper
.for doc in jasper jpeg2000
diff -r 8024be235196 -r d5bcff56aafa mk/compiler.mk
--- a/mk/compiler.mk Sat Dec 02 19:15:13 2006 +0000
+++ b/mk/compiler.mk Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: compiler.mk,v 1.56 2006/11/16 02:42:13 markd Exp $
+# $NetBSD: compiler.mk,v 1.57 2006/12/02 22:32:59 jschauma Exp $
#
# This Makefile fragment implements handling for supported C/C++/Fortran
# compilers.
@@ -49,8 +49,8 @@
# USE_LANGUAGES
# Lists the languages used in the source code of the package,
# and is used to determine the correct compilers to install.
-# Valid values are: c, c++, fortran, java, objc. The default
-# is "c".
+# Valid values are: c, c99, c++, fortran, java, objc. The
+# default is "c".
#
# The following variables are defined, and available for testing in
# package Makefiles:
diff -r 8024be235196 -r d5bcff56aafa mk/compiler/gcc.mk
--- a/mk/compiler/gcc.mk Sat Dec 02 19:15:13 2006 +0000
+++ b/mk/compiler/gcc.mk Sat Dec 02 22:32:59 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.85 2006/10/22 00:14:17 rillig Exp $
+# $NetBSD: gcc.mk,v 1.86 2006/12/02 22:32:59 jschauma Exp $
#
# This is the compiler definition for the GNU Compiler Collection.
#
@@ -137,6 +137,10 @@
_LANGUAGES.gcc+= ${LANGUAGES.gcc:M${_lang_}}
Home |
Main Index |
Thread Index |
Old Index