pandora-build v0.61

diff --git a/m4/pandora_64bit.m4 b/m4/pandora_64bit.m4
index c1812f404ad5f1772023c2a893d0073d78429a4c..ed123d2b893f56030aa766e68a7de8db52b2bbda 100644 (file)
--- a/m4/pandora_64bit.m4
+++ b/m4/pandora_64bit.m4
@@ -23,7 +23,7 @@ AC_DEFUN([PANDORA_64BIT],[
   AS_IF([test "$isainfo_b" != "x"],[
 
     isainfo_k=`${ISAINFO} -k` 
   AS_IF([test "$isainfo_b" != "x"],[
 
     isainfo_k=`${ISAINFO} -k` 

-    DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_k}"
+    DTRACEFLAGS="${DTRACEFLAGS} -${isainfo_b}"

 
     AS_IF([test "x$ac_enable_64bit" = "xyes"],[
 
 
     AS_IF([test "x$ac_enable_64bit" = "xyes"],[
 

diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4
index 5bf12598b092b92a01b6d2e2b23fc3c056e9779b..0fcaca147b3e279a1907ea0ee5f4a93ec38de50a 100644 (file)
--- a/m4/pandora_canonical.m4
+++ b/m4/pandora_canonical.m4
@@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using
 dnl with or without modifications, as long as this notice is preserved.
 
 dnl Which version of the canonical setup we're using

-AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.57])
+AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.61])

 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds
 
 AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[
   dnl Force dependency tracking on for Sun Studio builds

diff --git a/m4/pandora_enable_dtrace.m4 b/m4/pandora_enable_dtrace.m4
index e1f82da088225eafbf4883d57285ba0d668441d4..18c2d6483c4eccdc896277386c9fd590d4953c56 100644 (file)
--- a/m4/pandora_enable_dtrace.m4
+++ b/m4/pandora_enable_dtrace.m4
@@ -17,6 +17,7 @@ AC_DEFUN([PANDORA_ENABLE_DTRACE],[
     AC_CHECK_PROGS([DTRACE], [dtrace])
     AS_IF([test "x$ac_cv_prog_DTRACE" = "xdtrace"],[
       AC_DEFINE([HAVE_DTRACE], [1], [Enables DTRACE Support])
     AC_CHECK_PROGS([DTRACE], [dtrace])
     AS_IF([test "x$ac_cv_prog_DTRACE" = "xdtrace"],[
       AC_DEFINE([HAVE_DTRACE], [1], [Enables DTRACE Support])

+      AC_MSG_CHECKING([if dtrace should instrument object files])

       dnl DTrace on MacOSX does not use -G option
       cat >conftest.d <<_ACEOF
 provider Example {
       dnl DTrace on MacOSX does not use -G option
       cat >conftest.d <<_ACEOF
 provider Example {


@@ -24,9 +25,10 @@ provider Example {
 };
 _ACEOF
       $DTRACE -G -o conftest.d.o -s conftest.d 2>/dev/zero
 };
 _ACEOF
       $DTRACE -G -o conftest.d.o -s conftest.d 2>/dev/zero

-      AS_IF([test $? -eq 0],[ac_cv_dtrace_needs_objects=yes])
+      AS_IF([test $? -eq 0],[ac_cv_dtrace_needs_objects=yes],
+            [ac_cv_dtrace_needs_objects=no])

       rm -f conftest.d.o conftest.d
       rm -f conftest.d.o conftest.d

-
+      AC_MSG_RESULT($ac_cv_dtrace_needs_objects)

       AC_SUBST(DTRACEFLAGS) dnl TODO: test for -G on OSX
       ac_cv_have_dtrace=yes
     ])])
       AC_SUBST(DTRACEFLAGS) dnl TODO: test for -G on OSX
       ac_cv_have_dtrace=yes
     ])])

diff --git a/m4/pandora_plugins.m4 b/m4/pandora_plugins.m4
index 40c789fcc8060dfdbf874dce8df134ab535267ea..75e3732959f491b5ee2870b5d5b02d9d633c7b0a 100644 (file)
--- a/m4/pandora_plugins.m4
+++ b/m4/pandora_plugins.m4
@@ -18,11 +18,11 @@ AC_DEFUN([PANDORA_PLUGINS],[
   pandora_builtin_list=`echo $pandora_builtin_list | sed 's/, *$//'`
   AS_IF([test "x$pandora_builtin_list" = "x"], pandora_builtin_list="NULL")
   AC_SUBST([PANDORA_BUILTIN_LIST],[$pandora_builtin_list])
   pandora_builtin_list=`echo $pandora_builtin_list | sed 's/, *$//'`
   AS_IF([test "x$pandora_builtin_list" = "x"], pandora_builtin_list="NULL")
   AC_SUBST([PANDORA_BUILTIN_LIST],[$pandora_builtin_list])

-  m4_ifblank($1,[
+  m4_ifval(m4_normalize([$1]),[
+    AC_CONFIG_FILES($*)
+    ],[

     AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list],
                        [List of plugins to be built in])
     AC_DEFINE_UNQUOTED([PANDORA_BUILTIN_LIST],[$pandora_builtin_list],
                        [List of plugins to be built in])

-    ],[
-    AC_CONFIG_FILES($*)

   ])
 
 
   ])
 
 

diff --git a/m4/pandora_vc_build.m4 b/m4/pandora_vc_build.m4
index fa54986af4cdfcf0230ed3826610036662b52330..d84b96767f3b499619c57c8e677eb2433c1e16ed 100644 (file)
--- a/m4/pandora_vc_build.m4
+++ b/m4/pandora_vc_build.m4
@@ -40,10 +40,10 @@ AC_DEFUN([PANDORA_BUILDING_FROM_VC],[
   
 dnl Takes one argument which is the prefix to append
 AC_DEFUN([PANDORA_EXPORT_BZR_INFO],[
   
 dnl Takes one argument which is the prefix to append
 AC_DEFUN([PANDORA_EXPORT_BZR_INFO],[

-  m4_ifnblank($1,[
-    m4_define([PEBI_PREFIX],m4_toupper(m4_normalize($1))[_])
-  ],[
+  m4_ifval(m4_normalize([$1]),[

     m4_define([PEBI_PREFIX],[])
     m4_define([PEBI_PREFIX],[])

+  ],[
+    m4_define([PEBI_PREFIX],m4_toupper(m4_normalize($1))[_])

   ])
 
   AC_DEFINE(PEBI_PREFIX[BZR_REVID], ["BZR_REVID"], [bzr revision ID])
   ])
 
   AC_DEFINE(PEBI_PREFIX[BZR_REVID], ["BZR_REVID"], [bzr revision ID])

diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4
index 9ccb95bd9d4ea5ad325d07d9776c4ed358049218..7241ba7cb9d7f611951d9bdc6511e3add4efa29b 100644 (file)
--- a/m4/pandora_warnings.m4
+++ b/m4/pandora_warnings.m4
@@ -204,10 +204,49 @@ template <> void C<int>::foo();
       AS_IF([test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"],
             [CXX_WARNINGS="${CXX_WARNINGS} -Wredundant-decls"],
             [CXX_WARNINGS="${CXX_WARNINGS} -Wno-redundant-decls"])
       AS_IF([test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"],
             [CXX_WARNINGS="${CXX_WARNINGS} -Wredundant-decls"],
             [CXX_WARNINGS="${CXX_WARNINGS} -Wno-redundant-decls"])

+
+      AC_CACHE_CHECK([whether it is safe to use -Wattributes from C++],
+        [ac_cv_safe_to_use_Wattributes_],
+        [AC_LANG_PUSH(C++)
+         save_CXXFLAGS="${CXXFLAGS}"
+         CXXFLAGS="${W_FAIL} -pedantic -Wattributes -fvisibility=hidden ${AM_CXXFLAGS}"
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([
+#include <google/protobuf/message.h>
+#include <google/protobuf/descriptor.h>
+
+
+const ::google::protobuf::EnumDescriptor* Table_TableOptions_RowType_descriptor();
+enum Table_TableOptions_RowType {
+  Table_TableOptions_RowType_ROW_TYPE_DEFAULT = 0,
+  Table_TableOptions_RowType_ROW_TYPE_FIXED = 1,
+  Table_TableOptions_RowType_ROW_TYPE_DYNAMIC = 2,
+  Table_TableOptions_RowType_ROW_TYPE_COMPRESSED = 3,
+  Table_TableOptions_RowType_ROW_TYPE_REDUNDANT = 4,
+  Table_TableOptions_RowType_ROW_TYPE_COMPACT = 5,
+  Table_TableOptions_RowType_ROW_TYPE_PAGE = 6
+};
+
+namespace google {
+namespace protobuf {
+template <>
+inline const EnumDescriptor* GetEnumDescriptor<Table_TableOptions_RowType>() {
+  return Table_TableOptions_RowType_descriptor();
+}
+}
+}
+            ])],
+            [ac_cv_safe_to_use_Wattributes_=yes],
+            [ac_cv_safe_to_use_Wattributes_=no])
+          CXXFLAGS="${save_CXXFLAGS}"
+          AC_LANG_POP()])
+      AS_IF([test "$ac_cv_safe_to_use_Wattributes_" = "yes"],
+            [],
+            [CXX_WARNINGS="${CXX_WARNINGS} -Wno-attributes"])

   
       NO_REDUNDANT_DECLS="-Wno-redundant-decls"
       dnl TODO: Figure out a better way to deal with this:
   
       NO_REDUNDANT_DECLS="-Wno-redundant-decls"
       dnl TODO: Figure out a better way to deal with this:

-      PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces"
+      PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces -Wno-attributes"

       NO_WERROR="-Wno-error"
       INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align"
       
       NO_WERROR="-Wno-error"
       INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align"