zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-906494 into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Chris Hillery (ceejatec)
Related bugs:
  Bug #906494 in Zorba: "default compile with D_FILE_OFFSET_BITS=64"
  https://bugs.launchpad.net/zorba/+bug/906494

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-906494/+merge/101700

fix for bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-906494/+merge/101700
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'CMakeCompiler.txt'
--- CMakeCompiler.txt	2012-03-28 05:19:57 +0000
+++ CMakeCompiler.txt	2012-04-12 09:35:23 +0000
@@ -108,6 +108,9 @@
   IF(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
   ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
+  IF(NOT CMAKE_CXX_FLAGS MATCHES "-D_FILE_OFFSET_BITS")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
+  ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "-D_FILE_OFFSET_BITS")
   IF (UNIX AND NOT APPLE)
     IF (NOT CMAKE_SHARED_LINKER_FLAGS MATCHES "as-needed")
       SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")

=== modified file 'ChangeLog'
--- ChangeLog	2012-04-10 15:41:57 +0000
+++ ChangeLog	2012-04-12 09:35:23 +0000
@@ -16,6 +16,7 @@
   * Fixed bug #967428 (do not hoist index creation outside a try-catch)
   * Fixed performance problem with the findNodeSources function of the no-copy rule
   * Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
+  * Fixed bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
   * Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
   * Fixed bug #949910 (has-children may be invoked on all nodes). Internally, zorba::store::Item::getChildren() now returns NULL on node classes without offspring (instead of raising an error).