Changeset: 1aea20ca910d for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1aea20ca910d Modified Files: configure.ag pathfinder/compiler/Makefile.ag pathfinder/compiler/algebra/Makefile.ag pathfinder/compiler/algebra/hskparser/Makefile.ag pathfinder/compiler/algebra/map/Makefile.ag pathfinder/compiler/algebra/opt/Makefile.ag pathfinder/compiler/algebra/prop/Makefile.ag pathfinder/compiler/core/Makefile.ag pathfinder/compiler/debug/Makefile.ag pathfinder/compiler/mem/Makefile.ag pathfinder/compiler/mil/Makefile.ag pathfinder/compiler/parser/Makefile.ag pathfinder/compiler/schema/Makefile.ag pathfinder/compiler/semantics/Makefile.ag pathfinder/compiler/sql/Makefile.ag pathfinder/compiler/utils/Makefile.ag pathfinder/compiler/xmlimport/Makefile.ag pathfinder/modules/geoxml/Makefile.ag pathfinder/modules/pftijah/Makefile.ag pathfinder/modules/pftijah/tjc/Makefile.ag pathfinder/modules/probxml/Makefile.ag pathfinder/runtime/Makefile.ag pathfinder/runtime5/Makefile.ag pathfinder/src/sqlhelpers/xmlshred/Makefile.ag Branch: Mar2011 Log Message:
build-sys: only use C99 for pathfinder Enabling C99 mode of the compiler, causes some features to be enabled, that conflict with the features we require on Solaris. Since our code doesn't need C99, but only pathfinder, we now *only* enable C99 mode there. http://monetdb.cwi.nl/testing/projects/monetdb/testweb/logs/39341:5f4c23b04b58/GNU-Solaris-sparcv9/make.html#l221 diffs (270 lines): diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -879,7 +879,13 @@ AC_SUBST(NO_OPTIMIZE_FILES) if test "x$enable_pathfinder" != xno; then + saveCC="${CC}" AC_PROG_CC_C99 + C99="${CC}" + AC_SUBST(C99) + # Do not compile everything with C99, because in particular on + # Solaris this yields in standards conflicts in the header files + CC="${saveCC}" if test "x$ac_cv_prog_cc_c99" = xno; then if test "x$enable_pathfinder" = xyes; then AC_MSG_ERROR([Pathfinder requires a C99 compliant C compiler, but your C compiler does not seem to be C99 compliant.]) diff --git a/pathfinder/compiler/Makefile.ag b/pathfinder/compiler/Makefile.ag --- a/pathfinder/compiler/Makefile.ag +++ b/pathfinder/compiler/Makefile.ag @@ -25,6 +25,7 @@ EXTRA_DIST_DIR = Tests +CC = $(C99) INCLUDES = \ include \ ../../common/options \ diff --git a/pathfinder/compiler/algebra/Makefile.ag b/pathfinder/compiler/algebra/Makefile.ag --- a/pathfinder/compiler/algebra/Makefile.ag +++ b/pathfinder/compiler/algebra/Makefile.ag @@ -31,6 +31,7 @@ #SUBDIRS = hskparser SUBDIRS = opt prop map +CC = $(C99) INCLUDES = \ ../include \ ../../../common/options \ diff --git a/pathfinder/compiler/algebra/hskparser/Makefile.ag b/pathfinder/compiler/algebra/hskparser/Makefile.ag --- a/pathfinder/compiler/algebra/hskparser/Makefile.ag +++ b/pathfinder/compiler/algebra/hskparser/Makefile.ag @@ -27,6 +27,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = ../../include $(MONET_INCS) PARSERNAME = hsk diff --git a/pathfinder/compiler/algebra/map/Makefile.ag b/pathfinder/compiler/algebra/map/Makefile.ag --- a/pathfinder/compiler/algebra/map/Makefile.ag +++ b/pathfinder/compiler/algebra/map/Makefile.ag @@ -30,6 +30,7 @@ SUBDIRS = +CC = $(C99) INCLUDES = \ ../../include \ ../../../../common/options \ diff --git a/pathfinder/compiler/algebra/opt/Makefile.ag b/pathfinder/compiler/algebra/opt/Makefile.ag --- a/pathfinder/compiler/algebra/opt/Makefile.ag +++ b/pathfinder/compiler/algebra/opt/Makefile.ag @@ -30,6 +30,7 @@ SUBDIRS = +CC = $(C99) INCLUDES = \ ../../include \ ../../../../common/options \ diff --git a/pathfinder/compiler/algebra/prop/Makefile.ag b/pathfinder/compiler/algebra/prop/Makefile.ag --- a/pathfinder/compiler/algebra/prop/Makefile.ag +++ b/pathfinder/compiler/algebra/prop/Makefile.ag @@ -30,6 +30,7 @@ SUBDIRS = +CC = $(C99) INCLUDES = \ ../../include \ ../../../../common/options \ diff --git a/pathfinder/compiler/core/Makefile.ag b/pathfinder/compiler/core/Makefile.ag --- a/pathfinder/compiler/core/Makefile.ag +++ b/pathfinder/compiler/core/Makefile.ag @@ -27,6 +27,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = ../include ../../../common/options ../../../gdk lib_core = { diff --git a/pathfinder/compiler/debug/Makefile.ag b/pathfinder/compiler/debug/Makefile.ag --- a/pathfinder/compiler/debug/Makefile.ag +++ b/pathfinder/compiler/debug/Makefile.ag @@ -27,6 +27,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = ../include ../../../common/options ../../../gdk lib_logdebug = { diff --git a/pathfinder/compiler/mem/Makefile.ag b/pathfinder/compiler/mem/Makefile.ag --- a/pathfinder/compiler/mem/Makefile.ag +++ b/pathfinder/compiler/mem/Makefile.ag @@ -27,6 +27,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = ../include ../../../common/options ../../../gdk CFLAGS = $(LIBGC_CFLAGS) diff --git a/pathfinder/compiler/mil/Makefile.ag b/pathfinder/compiler/mil/Makefile.ag --- a/pathfinder/compiler/mil/Makefile.ag +++ b/pathfinder/compiler/mil/Makefile.ag @@ -27,6 +27,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = ../include ../../../common/options ../../../gdk # ignore warning "null dimension: sizeof()" diff --git a/pathfinder/compiler/parser/Makefile.ag b/pathfinder/compiler/parser/Makefile.ag --- a/pathfinder/compiler/parser/Makefile.ag +++ b/pathfinder/compiler/parser/Makefile.ag @@ -41,6 +41,7 @@ # buildtools/conf/monet.m4). CFLAGS = $(GCC_BISON_CFLAGS) +CC = $(C99) INCLUDES = \ ../include \ ../../../common/options \ diff --git a/pathfinder/compiler/schema/Makefile.ag b/pathfinder/compiler/schema/Makefile.ag --- a/pathfinder/compiler/schema/Makefile.ag +++ b/pathfinder/compiler/schema/Makefile.ag @@ -27,6 +27,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = ../include ../../../common/options ../../../gdk CFLAGS = $(libxml2_CFLAGS) diff --git a/pathfinder/compiler/semantics/Makefile.ag b/pathfinder/compiler/semantics/Makefile.ag --- a/pathfinder/compiler/semantics/Makefile.ag +++ b/pathfinder/compiler/semantics/Makefile.ag @@ -27,6 +27,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = ../include ../../../common/options ../../../gdk # avoid "[PFty_is2ns]:ube: error: Assert has been violated at '/set/mars_patch/builds.intel-S2/nightly.Fri/intel-S2/lang/ube/hf/src/type.c 1583'" diff --git a/pathfinder/compiler/sql/Makefile.ag b/pathfinder/compiler/sql/Makefile.ag --- a/pathfinder/compiler/sql/Makefile.ag +++ b/pathfinder/compiler/sql/Makefile.ag @@ -27,6 +27,7 @@ # # Fri Oct 27 10:05:33 CEST 2006, Manuel Mayr +CC = $(C99) INCLUDES = ../include ../../../common/options ../../../gdk # locally disable "-Werror" diff --git a/pathfinder/compiler/utils/Makefile.ag b/pathfinder/compiler/utils/Makefile.ag --- a/pathfinder/compiler/utils/Makefile.ag +++ b/pathfinder/compiler/utils/Makefile.ag @@ -30,6 +30,7 @@ #SUBDIRS = utils lalgebra +CC = $(C99) INCLUDES = \ ../include \ ../../../common/options \ diff --git a/pathfinder/compiler/xmlimport/Makefile.ag b/pathfinder/compiler/xmlimport/Makefile.ag --- a/pathfinder/compiler/xmlimport/Makefile.ag +++ b/pathfinder/compiler/xmlimport/Makefile.ag @@ -27,6 +27,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = \ ../include \ ../../../common/options \ diff --git a/pathfinder/modules/geoxml/Makefile.ag b/pathfinder/modules/geoxml/Makefile.ag --- a/pathfinder/modules/geoxml/Makefile.ag +++ b/pathfinder/modules/geoxml/Makefile.ag @@ -26,6 +26,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = \ ../../runtime \ ../../compiler/include \ diff --git a/pathfinder/modules/pftijah/Makefile.ag b/pathfinder/modules/pftijah/Makefile.ag --- a/pathfinder/modules/pftijah/Makefile.ag +++ b/pathfinder/modules/pftijah/Makefile.ag @@ -28,6 +28,7 @@ SUBDIRS = tjc +CC = $(C99) INCLUDES = \ ../../runtime \ ../../compiler/include \ diff --git a/pathfinder/modules/pftijah/tjc/Makefile.ag b/pathfinder/modules/pftijah/tjc/Makefile.ag --- a/pathfinder/modules/pftijah/tjc/Makefile.ag +++ b/pathfinder/modules/pftijah/tjc/Makefile.ag @@ -29,6 +29,7 @@ YFLAGS = -d -p $(PARSERNAME) LFLAGS = -P$(PARSERNAME) +CC = $(C99) INCLUDES = \ ../../../../monetdb4/monet \ ../../../../monetdb4/modules/plain \ diff --git a/pathfinder/modules/probxml/Makefile.ag b/pathfinder/modules/probxml/Makefile.ag --- a/pathfinder/modules/probxml/Makefile.ag +++ b/pathfinder/modules/probxml/Makefile.ag @@ -26,6 +26,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = \ ../../runtime \ ../../compiler/include \ diff --git a/pathfinder/runtime/Makefile.ag b/pathfinder/runtime/Makefile.ag --- a/pathfinder/runtime/Makefile.ag +++ b/pathfinder/runtime/Makefile.ag @@ -30,6 +30,7 @@ EXTRA_DIST_DIR = Tests +CC = $(C99) INCLUDES = \ .. \ ../../monetdb4/monet \ diff --git a/pathfinder/runtime5/Makefile.ag b/pathfinder/runtime5/Makefile.ag --- a/pathfinder/runtime5/Makefile.ag +++ b/pathfinder/runtime5/Makefile.ag @@ -26,6 +26,7 @@ # Rights Reserved. # +CC = $(C99) INCLUDES = ../compiler/include ../runtime \ ../../monetdb5/modules/atoms \ ../../monetdb5/compiler \ diff --git a/pathfinder/src/sqlhelpers/xmlshred/Makefile.ag b/pathfinder/src/sqlhelpers/xmlshred/Makefile.ag --- a/pathfinder/src/sqlhelpers/xmlshred/Makefile.ag +++ b/pathfinder/src/sqlhelpers/xmlshred/Makefile.ag @@ -15,6 +15,7 @@ # All Rights Reserved. MTSAFE +CC = $(C99) INCLUDES = ./include \ ../../../compiler/include \ ../../../compiler \ _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
