MonetDB: Jan2014 - Ported to OpenIndiana with native toolset.
Changeset: 5b0205791540 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b0205791540
Modified Files:
bootstrap
configure.ag
testing/difflib.c
Branch: Jan2014
Log Message:
Ported to OpenIndiana with native toolset.
This now works with the Sun Studio Express compiler. Some GNU tools
are needed (gmake, gdiff), but not gcc, and certainly no Gentoo prefix.
diffs (99 lines):
diff --git a/bootstrap b/bootstrap
--- a/bootstrap
+++ b/bootstrap
@@ -56,3 +56,6 @@ aclocal ${_m4_extra_dirs}
autoheader
automake --add-missing --copy --foreign
autoconf
+if [ -f buildtools/conf/install-sh -a ! -x buildtools/conf/install-sh ]; then
+chmod +x buildtools/conf/install-sh
+fi
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -400,9 +400,20 @@ case $CC_version in
CC_ver=clang-$gcc_ver
;;
*)
- AC_MSG_WARN([compiler not recognized: `$CC --version` says
+ CC_version=`$CC -V 21`
+ case $CC_version in
+ *Sun\ Ceres\ C\ *|*Sun\ C\ *)
+ # developer/sunstudioexpress and
+ # developer/sunstudio12u1 respectively
+ CC_ver=suncc-`echo $CC_version | sed -n 's/.*Sun Ceres C
\(.*\) SunOS.*/\1/p;s/.*Sun C \(.*\) SunOS.*/\1/p'`
+ ;;
+ *)
+ AC_MSG_WARN([compiler not recognized: `$CC --version` says
$CC_version
- ]);;
+ ])
+ ;;
+ esac
+ ;;
esac
AC_MSG_RESULT($CC_ver)
@@ -412,6 +423,7 @@ yes!*clang*!clang-*);;
yes!*gcc*!clang-*) ;;
yes!*gcc*!gcc-*) ;;
!*icc*!icc-*) ;;
+*!*!suncc-*) ;;
*) AC_MSG_WARN([compiler potentially not (correctly) recognized:
GCC=$GCC
CC=$CC
@@ -1122,6 +1134,8 @@ AC_PATH_PROG(BASH,bash, /usr/bin/bash, $
AC_CHECK_PROG(RM,rm,rm -f)
AC_CHECK_PROG(MV,mv,mv -f)
AC_PROG_LN_S
+AC_CHECK_PROGS(DIFF,gdiff diff)
+AC_DEFINE_UNQUOTED([DIFF], $DIFF, [Program to perform diffs])
AC_CHECK_PROGS(RPMBUILD,rpmbuild rpm)
@@ -1893,7 +1907,7 @@ if test x$have_pthread != xno; then
LIBS=$LIBS $PTHREAD_LIBS
pthread_found=yes
AC_SEARCH_LIBS([sem_init], [pthreadGC2 pthreadGC1
pthreadGC pthread],
- [LIBS=$LIBS $ac_cv_search_sem_init],
+ [test $ac_cv_search_sem_init = none
required || LIBS=$LIBS $ac_cv_search_sem_init],
[pthread_found=no])
if test x$pthread_found = xno ; then
pthread_found=yes
@@ -2460,9 +2474,21 @@ if test x$have_atomic_ops = xyes ; t
why_have_atomic_ops=(atomic_ops do not compile with Intel's
icc)
;;
*)
- AC_DEFINE(HAVE_LIBATOMIC_OPS, 1, [Define if you have the
libatomic_ops library])
+ # On some systems, notably OpenIndiana, atomic_ops may
+ # seem to be installed in that there is a pkg-config
+ # file for it, but that file contains incorrect
+ # information, and can not, in fact, be used. The
+ # bogus pkg-config file for atomic_ops is part of the
+ # library/gc package.
+ save_CFLAGS=$CFLAGS
CFLAGS=$CFLAGS $atomic_ops_CFLAGS
- LIBS=$LIBS $atomic_ops_LIBS
+
AC_CHECK_HEADERS([atomic_ops.h],[have_atomic_ops=yes],[have_atomic_ops=no
why_have_atomic_ops=(atomic_ops was incorrectly installed (happens on at least
Solaris/OpenIndiana))])
+ CFAGS=$save_CFLAGS
+ if test x$have_atomic_ops = xyes ; then
+ AC_DEFINE(HAVE_LIBATOMIC_OPS, 1, [Define if you have
the libatomic_ops library])
+ CFLAGS=$CFLAGS $atomic_ops_CFLAGS
+ LIBS=$LIBS $atomic_ops_LIBS
+ fi
;;
esac
fi
diff --git a/testing/difflib.c b/testing/difflib.c
--- a/testing/difflib.c
+++ b/testing/difflib.c
@@ -49,7 +49,9 @@
#define getpid _getpid
#define unlink _unlink
#else
+#ifndef DIFF
#define DIFF diff
+#endif
#ifndef DIR_SEP
# define DIR_SEP '/'
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - Do some more sanity checking.
Changeset: 5b7d26fab967 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b7d26fab967 Modified Files: configure.ag Branch: Jan2014 Log Message: Do some more sanity checking. diffs (13 lines): diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -2955,6 +2955,9 @@ AC_SUBST(HWCOUNTERS_LIBS) AC_SUBST(HWCOUNTERS_INCS) dnl check dependencies (might need more than just SQL) +if test x$enable_sql = xyes test x$enable_monetdb5 = xno ; then + AC_MSG_ERROR([MonetDB/SQL requires MonetDB5.]) +fi if test x$enable_sql = xauto test x$enable_monetdb5 = xno ; then enable_sql=no if test x$disable_sql = x; then ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jan2014 - Make error message clearer.
Changeset: ab9e5c81f165 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab9e5c81f165
Modified Files:
configure.ag
Branch: Jan2014
Log Message:
Make error message clearer.
diffs (12 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2956,7 +2956,7 @@ AC_SUBST(HWCOUNTERS_INCS)
dnl check dependencies (might need more than just SQL)
if test x$enable_sql = xyes test x$enable_monetdb5 = xno ; then
- AC_MSG_ERROR([MonetDB/SQL requires MonetDB5.])
+ AC_MSG_ERROR([MonetDB/SQL requires MonetDB5${disable_monetdb5:+
$disable_monetdb5}.])
fi
if test x$enable_sql = xauto test x$enable_monetdb5 = xno ; then
enable_sql=no
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - mserver5: make debug mask visible in gdk opti...
Changeset: f4cbcc7d9b53 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4cbcc7d9b53
Modified Files:
tools/mserver/mserver5.c
Branch: default
Log Message:
mserver5: make debug mask visible in gdk options printout
diffs (19 lines):
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -425,12 +425,13 @@ main(int argc, char **av)
if (debug || grpdebug) {
char buf[16];
+ char wasdebug = debug != 0;
- if (debug)
- mo_print_options(set, setlen);
debug |= grpdebug; /* add the algorithm tracers */
snprintf(buf, sizeof(buf) - 1, %d, debug);
setlen = mo_add_option(set, setlen, opt_cmdline, gdk_debug,
buf);
+ if (wasdebug)
+ mo_print_options(set, setlen);
}
monet_script = (str *) malloc(sizeof(str) * (argc + 1));
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - mal_http_daemon: provide dummy implementations
Changeset: fdb535e7e4cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fdb535e7e4cc
Modified Files:
monetdb5/mal/mal_http_daemon.c
monetdb5/mal/mal_private.h
Branch: default
Log Message:
mal_http_daemon: provide dummy implementations
Since the API for this file is statically defined no matter what, make
sure the symbols are available as well, no matter what.
diffs (46 lines):
diff --git a/monetdb5/mal/mal_http_daemon.c b/monetdb5/mal/mal_http_daemon.c
--- a/monetdb5/mal/mal_http_daemon.c
+++ b/monetdb5/mal/mal_http_daemon.c
@@ -277,4 +277,31 @@ void stopHttpdaemon(void){
MT_join_thread(hdthread);
}
+#else
+
+#include mal.h
+#include mal_exception.h
+#include mal_private.h
+#include mal_http_daemon.h
+
+/* dummy noop functions to implement the exported API, if these had been
+ * defined to return a str, we could have informed the caller no
+ * implementation was available */
+
+void
+register_http_handler(http_request_handler handler)
+{
+ (void)handler;
+}
+
+void
+startHttpdaemon(void)
+{
+}
+
+void
+stopHttpdaemon(void)
+{
+}
+
#endif
diff --git a/monetdb5/mal/mal_private.h b/monetdb5/mal/mal_private.h
--- a/monetdb5/mal/mal_private.h
+++ b/monetdb5/mal/mal_private.h
@@ -92,6 +92,7 @@ extern void malGarbageCollector(MalBlkPt
extern void listFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int
first, int step)
__attribute__((__visibility__(hidden)));
+/* mal_http_daemon.h */
extern void startHttpdaemon(void)
__attribute__((__visibility__(hidden)));
extern void stopHttpdaemon(void)
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - mserver5: do a slight check on debug argument
Changeset: bc8e33f27792 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bc8e33f27792
Modified Files:
tools/mserver/mserver5.c
Branch: default
Log Message:
mserver5: do a slight check on debug argument
Make sure debug is a number such that wrong input doesn't go unnoticed
when we do something like mserver5 --debug=HEADLESS (obviously, this was
too naive, but anyway).
diffs (18 lines):
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -380,7 +380,13 @@ main(int argc, char **av)
break;
case 'd':
if (optarg) {
- debug |= strtol(optarg, NULL, 10);
+ char *endarg;
+ debug |= strtol(optarg, endarg, 10);
+ if (*endarg != '\0') {
+ fprintf(stderr, ERROR: wrong format
for --debug=%s\n,
+ optarg);
+ usage(prog, -1);
+ }
} else {
debug |= 1;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - make sure we consitently use the mkey hash fu...
Changeset: a0249aa59e13 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0249aa59e13 Modified Files: sql/common/sql_types.c Branch: default Log Message: make sure we consitently use the mkey hash function. (todo refactor these hash functions) diffs (12 lines): diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c --- a/sql/common/sql_types.c +++ b/sql/common/sql_types.c @@ -1175,7 +1175,7 @@ sqltypeinit( sql_allocator *sa) sql_create_func(sa, not_uniques, sql, not_uniques, OID, NULL, OID, SCALE_NONE); /* functions needed for all types */ - sql_create_func(sa, hash, calc, hash, ANY, NULL, WRD, SCALE_FIX); + sql_create_func(sa, hash, mkey, hash, ANY, NULL, WRD, SCALE_FIX); sql_create_func3(sa, rotate_xor_hash, calc, rotate_xor_hash, WRD, INT, ANY, WRD, SCALE_NONE); sql_create_func(sa, =, calc, =, ANY, ANY, BIT, SCALE_FIX); sql_create_func(sa, , calc, !=, ANY, ANY, BIT, SCALE_FIX); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
