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 2>&1`"
+ 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" = x"yes" ; 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" = x"yes" ; 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
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
