Changeset: ffa5213b9a45 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ffa5213b9a45
Modified Files:
configure.ag
gdk/gdk.h
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_utils.c
monetdb5/modules/mal/Makefile.ag
Branch: headless
Log Message:
Merged from default
diffs (203 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -377,9 +377,10 @@
fd.write("uninstall-local-%s: \n" % script)
fd.write("\t$(RM) $(DESTDIR)%s/%s\n\n" % (sd, script))
- am['INSTALL'].append(s)
- am['UNINSTALL'].append(s)
- am['InstallList'].append("\t"+sd+"/"+script+cond+"\n")
+ if not scripts.has_key('NOINST'):
+ am['INSTALL'].append(s)
+ am['UNINSTALL'].append(s)
+ am['InstallList'].append("\t"+sd+"/"+script+cond+"\n")
am_find_ins(am, scripts)
am_deps(fd, scripts['DEPS'], am)
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -33,6 +33,7 @@
-r nr | --rows=nr for pagination
-w nr | --width=nr for pagination
-D | --dump create an SQL dump
+ -N | --inserts use INSERT INTO statements when dumping
# 18:57:57 >
# 18:57:57 > Done.
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -17,7 +17,8 @@
MTSAFE
-INCLUDES = ../../common/options ../../common/stream $(openssl_CFLAGS)
+INCLUDES = ../../common/options ../../common/stream \
+ $(openssl_CFLAGS) $(MSGCONTROL_FLAGS)
lib_mapi = {
VERSION = $(MAPI_VERSION)
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -296,7 +296,11 @@
case $host in
*-solaris*)
dnl Solaris needs this to get msg_control and msg_controllen
- AC_DEFINE(_XOPEN_SOURCE, 500, [for msg_control and
msg_controllen])
+ dnl it disables, however, the availability of madvise, which is
+ dnl in use use by GDK, so we cannot just AC_DEFINE this, but
+ dnl rather have to enable it where it is necessary
+ MSGCONTROL_FLAGS="-D_XOPEN_SOURCE=500"
+ AC_SUBST(MSGCONTROL_FLAGS)
;;
esac
@@ -3238,14 +3242,25 @@
echo
echo "MonetDB is configured as follows:"
echo "* Compilation specifics:"
-echo " Host: ${ac_cv_host}"
-echo " Compiler: ${CC}/${CXX}"
-echo " CFLAGS: ${CFLAGS}"
-echo " X_CFLAGS: ${X_CFLAGS}"
-echo " LDFLAGS: ${LDFLAGS}"
+echo " Host: " ${ac_cv_host}
+echo " Compiler: " ${CC}/${CXX}
+echo " CFLAGS: " ${CFLAGS}
+echo " X_CFLAGS: " ${X_CFLAGS}
+echo " LDFLAGS: " ${LDFLAGS}
echo
echo "* Enabled/disabled components:"
-for comp in common monetdb5 sql geom unixodbc java testing; do
+for comp in \
+ common \
+ monetdb5 \
+ sql \
+ geom \
+ unixodbc \
+ java \
+ jdbc \
+ xrpc \
+ control \
+ testing \
+; do
echo $ECHO_N " $comp is $ECHO_C"
eval "if test \"x\$enable_$comp\" = xno ; then echo
\"${ECHO_T}disabled\"; else echo \"${ECHO_T}enabled\"; fi"
done
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -318,7 +318,6 @@
#ifndef _GDK_H_
#define _GDK_H_
-#include "monetdb_config.h"
/* standard includes upon which all configure tests depend */
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -29,6 +29,7 @@
* the WIN32 native platform.
*/
+#include "monetdb_config.h"
#include "gdk.h" /* includes gdk_posix.h */
#include "mutils.h"
#include <stdio.h>
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -20,7 +20,6 @@
#ifndef GDK_POSIX_H
#define GDK_POSIX_H
-#include "monetdb_config.h"
#include <sys/types.h>
#ifdef HAVE_MALLOC_H
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1456,6 +1456,8 @@
GDKremovedir(DELDIR);
CBPinit();
+ HEAPcacheInit();
+
GDKenvkey = COLnew(TYPE_str, 100);
GDKenvval = COLnew(TYPE_str, 100);
if (GDKenvkey == NULL || GDKenvval == NULL)
@@ -1534,7 +1536,6 @@
MT_create_thread(&GDKvmtrim_id, GDKvmtrim, &GDK_mem_maxsize,
MT_THR_JOINABLE);
#endif
- HEAPcacheInit();
return 1;
}
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -26,6 +26,9 @@
copy /y "%srcdir%"\sql\sql\??_*.sql "%buildbase%\sql\sql\createdb"
if "@HAVE_RAPTOR_FALSE@"=="" del /y "%buildbase%\sql\sql\createdb\30_rdf.sql"
+copy /y "%srcdir%"\geom\monetdb5\??_*.mal
"%buildbase%\sql\backends\monet5\autoload"
+copy /y "%srcdir%"\geom\sql\??_*.sql "%buildbase%\sql\sql\createdb"
+
rem binaries (.exe)
set PATH=%buildbase%\clients\examples\C;%PATH%
set PATH=%buildbase%\clients\mapiclient;%PATH%
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -21,8 +21,7 @@
../../../common/stream \
../../../common/utils \
../../../gdk \
- $(libxml2_CFLAGS) \
- $(pcre_CFLAGS) $(zlib_CFLAGS) $(BZIP_INCS)
+ $(libxml2_CFLAGS) $(pcre_CFLAGS) $(zlib_CFLAGS) $(BZIP_INCS)
$(MSGCONTROL_FLAGS)
MTSAFE
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3685,12 +3685,12 @@
what = ""
for x, y, z in [(F_SKIP, "could not be executed", ""),
(F_WARN, "produced slightly different output",
"slightly"),
- (F_SOCK, "tests did not properly release socket(s)",
"SIGNIFICANTLY"),
- (F_TIME, "tests ran into timeout", "SIGNIFICANTLY"),
- (F_KILL, "tests had orphan processes killed",
"SIGNIFICANTLY"),
- (F_SEGV, "tests resulted in a crash", "SIGNIFICANTLY"),
- (F_RECU, "tests ran into too deep recursion",
"SIGNIFICANTLY"),
- (F_ERROR, "tests produced SIGNIFICANTLY different
output", "SIGNIFICANTLY")]:
+ (F_SOCK, "did not properly release socket(s)",
"SIGNIFICANTLY"),
+ (F_TIME, "ran into timeout", "SIGNIFICANTLY"),
+ (F_KILL, "had orphan processes killed",
"SIGNIFICANTLY"),
+ (F_SEGV, "resulted in a crash", "SIGNIFICANTLY"),
+ (F_RECU, "ran into too deep recursion",
"SIGNIFICANTLY"),
+ (F_ERROR, "produced SIGNIFICANTLY different output",
"SIGNIFICANTLY")]:
if Failure[x]:
how = z
what += " %3d out of %3d tests %s\n" %
(len(Failure[x]),num_tests, y)
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -29,7 +29,8 @@
../../../monetdb5/misc \
../../../common/stream \
../../../common/utils \
- ../../../clients/mapilib
+ ../../../clients/mapilib \
+ $(MSGCONTROL_FLAGS)
EXTRA_DIST = $(man_MANS) .merovingian_properties \
merovingian.h \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
