Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31236/conf
Modified Files:
MonetDB.m4 rules.mk
Log Message:
propagated changes of Tuesday Nov 06 2007 - Thursday Nov 08 2007
from the MonetDB_1-20 branch to the development trunk
Index: rules.mk
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/rules.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rules.mk 23 Jun 2007 07:07:18 -0000 1.3
+++ rules.mk 8 Nov 2007 11:20:42 -0000 1.4
@@ -125,32 +125,54 @@
# .xx file. There may be a race condition here when using a parallel
# make. We try to alleviate the problem by sending the .xx.c output
# to a dummy file in the second rule.
+# We also make sure that "$(CONFIG_H)" is included first, also with
swig-generated files.
+# This is crucial to prevent inconsistent (re-)definitions of macros.
%.ruby.c: %.ruby.i
$(SWIG) -ruby $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [EMAIL PROTECTED] >> $@
+ $(RM) [EMAIL PROTECTED]
%.ruby: %.ruby.i
$(SWIG) -ruby $(SWIGFLAGS) -outdir . -o dymmy.c $<
%.tcl.c: %.tcl.i
$(SWIG) -tcl $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [EMAIL PROTECTED] >> $@
+ $(RM) [EMAIL PROTECTED]
%.tcl: %.tcl.i
$(SWIG) -tcl $(SWIGFLAGS) -outdir . -o dymmy.c $<
%.php.c: %.php.i
$(SWIG) -php $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [EMAIL PROTECTED] >> $@
+ $(RM) [EMAIL PROTECTED]
%.php: %.php.i
$(SWIG) -php $(SWIGFLAGS) -outdir . -o dymmy.c $<
%.py.c: %.py.i
$(SWIG) -python $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [EMAIL PROTECTED] >> $@
+ $(RM) [EMAIL PROTECTED]
%.py: %.py.i
$(SWIG) -python $(SWIGFLAGS) -outdir . -o dymmy.c $<
%.pm.c: %.pm.i
$(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o $@ $<
+ $(MV) $@ [EMAIL PROTECTED]
+ echo '#include <'"$(CONFIG_H)"'>' > $@
+ grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' [EMAIL PROTECTED] >> $@
+ $(RM) [EMAIL PROTECTED]
%.pm: %.pm.i
$(SWIG) -perl5 $(SWIGFLAGS) -outdir . -o dymmy.c $<
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- MonetDB.m4 6 Nov 2007 14:28:32 -0000 1.45
+++ MonetDB.m4 8 Nov 2007 11:20:42 -0000 1.46
@@ -737,13 +737,21 @@
dnl (at least not with our strict X_CFLAGS), complaining about
dnl "warning: dereferencing type-punned pointer will break
strict-aliasing rules",
dnl "warning: unused variable '...'",
- dnl "warning: '...' defined but not used", and/or
- dnl 'error: "..." is not defined'.
+ dnl "warning: '...' defined but not used",
+ dnl "warning: unused parameter '...'",
+ dnl 'error: "..." is not defined', and/or
+ dnl "warning: missing initializer".
dnl Hence, we use GCC_SWIG_CFLAGS to disable the respective warning
- dnl as locally as possbile via "-Wno-strict-aliasing
-Wno-unused-variable -Wno-unused-function -Wno-undef"
+ dnl as locally as possbile via "-Wno-strict-aliasing
-Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-undef
-Wno-missing-field-initializers"
dnl (see also sql/src/backends/monet[45]/Makefile.ag,
dnl clients/src/{python,perl,php}/Cimpl/Makefile.ag).
- GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-strict-aliasing
-Wno-unused-variable -Wno-unused-function -Wno-undef"
+ GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-strict-aliasing
-Wno-unused-variable -Wno-unused-function -Wno-unused-parameter -Wno-undef"
+ case "$gcc_ver-$host_os" in
+ [[4-9]].*-*)
+ dnl -Wno-missing-field-initializers is only available (and
necessary) as of gcc 4.*
+ GCC_SWIG_CFLAGS="$GCC_SWIG_CFLAGS -Wno-missing-field-initializers"
+ esac
+
NO_INLINE_CFLAGS="-fno-inline -fno-inline-functions"
;;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
