[81642] trunk/base

3 Aug 2011

Revision: 81642
          http://trac.macports.org/changeset/81642
Author:   jmr@macports.org
Date:     2011-08-03 02:09:55 -0700 (Wed, 03 Aug 2011)
Log Message:
-----------
split -pedantic into a separate variable so it can be turned off individually, and use -Wextra instead of -W

Modified Paths:
--------------
    trunk/base/Mk/macports.autoconf.mk.in
    trunk/base/configure
    trunk/base/configure.ac
    trunk/base/src/darwintracelib1.0/Makefile
    trunk/base/src/programs/daemondo/Makefile.in

Modified: trunk/base/Mk/macports.autoconf.mk.in
===================================================================

--- trunk/base/Mk/macports.autoconf.mk.in	2011-08-03 08:24:51 UTC (rev 81641)
+++ trunk/base/Mk/macports.autoconf.mk.in	2011-08-03 09:09:55 UTC (rev 81642)
@@ -7,12 +7,13 @@
 VPATH			= @srcdir@
 
 CC			= @CC@
-CFLAGS			= @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR)
-OBJCFLAGS		= @OBJCFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR)
+CFLAGS			= @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_PEDANTIC) $(CFLAGS_WERROR)
+OBJCFLAGS		= @OBJCFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_PEDANTIC) $(CFLAGS_WERROR)
 CPPFLAGS		= @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
 TCL_DEFS		= @TCL_DEFS@
 SHLIB_CFLAGS		= @SHLIB_CFLAGS@
 CFLAGS_QUICHEEATERS	= @CFLAGS_QUICHEEATERS@
+CFLAGS_PEDANTIC		= @CFLAGS_PEDANTIC@
 CFLAGS_WERROR		= @CFLAGS_WERROR@
 
 READLINE_CFLAGS		=

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2011-08-03 08:24:51 UTC (rev 81641)
+++ trunk/base/configure	2011-08-03 09:09:55 UTC (rev 81642)
@@ -674,6 +674,7 @@
 PTHREAD_LIBS
 acx_pthread_config
 CFLAGS_WERROR
+CFLAGS_PEDANTIC
 CFLAGS_QUICHEEATERS
 TAR_CMD
 TAR_Q
@@ -6134,11 +6135,13 @@
 
 # Quiche eaters options.
 if test x$GCC = xyes; then
-	CFLAGS_QUICHEEATERS='-W -Wall -pedantic'
+	CFLAGS_QUICHEEATERS='-Wextra -Wall'
+	CFLAGS_PEDANTIC='-pedantic'
 fi
 
 
 
+
 	# Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; enable_werror=${enableval}

Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac	2011-08-03 08:24:51 UTC (rev 81641)
+++ trunk/base/configure.ac	2011-08-03 09:09:55 UTC (rev 81642)
@@ -152,9 +152,11 @@
 
 # Quiche eaters options.
 if test x$GCC = xyes; then
-	CFLAGS_QUICHEEATERS='-W -Wall -pedantic'
+	CFLAGS_QUICHEEATERS='-Wextra -Wall'
+	CFLAGS_PEDANTIC='-pedantic'
 fi
 AC_SUBST(CFLAGS_QUICHEEATERS)
+AC_SUBST(CFLAGS_PEDANTIC)
 MP_WERROR
 
 MP_COMPILER_ATTRIBUTE_UNUSED

Modified: trunk/base/src/darwintracelib1.0/Makefile
===================================================================
--- trunk/base/src/darwintracelib1.0/Makefile	2011-08-03 08:24:51 UTC (rev 81641)
+++ trunk/base/src/darwintracelib1.0/Makefile	2011-08-03 09:09:55 UTC (rev 81642)
@@ -7,6 +7,7 @@
 include ../../Mk/macports.autoconf.mk
 
 CFLAGS+= -fPIC -Wno-deprecated-declarations
+CFLAGS_PEDANTIC=
 
 all:: ${SHLIB_NAME}
 

Modified: trunk/base/src/programs/daemondo/Makefile.in
===================================================================
--- trunk/base/src/programs/daemondo/Makefile.in	2011-08-03 08:24:51 UTC (rev 81641)
+++ trunk/base/src/programs/daemondo/Makefile.in	2011-08-03 09:09:55 UTC (rev 81642)
@@ -8,7 +8,7 @@
 mandir=		@mandir@
 mandircat8=	${mandir}/cat8
 
-CFLAGS_QUICHEEATERS	= -W -Wall
+CFLAGS_PEDANTIC	=
 CPPFLAGS	+= -I../..
 SRCS		= main.c
 OBJS		= main.o

    

jmr＠macports.org

tags

participants (1)