Zorba

Merge lp:~zorba-coders/zorba/bug-906494 into lp:zorba

  1. bug-906494
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: Matthias Brantner
Approved revision: 10755
Merged at revision: 10755
Proposed branch: lp:~zorba-coders/zorba/bug-906494
Merge into: lp:zorba
Diff against target: 24 lines (+4/-0)
2 files modified
CMakeCompiler.txt (+3/-0)
ChangeLog (+1/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-906494
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Matthias Brantner Approve
Review via email: mp+101700@code.launchpad.net

Commit message

fix for bug #906494 (default compile with D_FILE_OFFSET_BITS=64)

Description of the change

fix for bug #906494 (default compile with D_FILE_OFFSET_BITS=64)

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-906494-2012-04-12T09-35-57.59Z/log.html

Revision history for this message
Chris Hillery (ceejatec) wrote :

It looks like this flag has been around long enough that we probably don't have to worry about having a CMake check that the flag is supported. So, looks good.

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-906494-2012-04-12T09-35-57.59Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeCompiler.txt'
2--- CMakeCompiler.txt 2012-03-28 05:19:57 +0000
3+++ CMakeCompiler.txt 2012-04-12 09:40:25 +0000
4@@ -108,6 +108,9 @@
5 IF(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
6 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
7 ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
8+ IF(NOT CMAKE_CXX_FLAGS MATCHES "-D_FILE_OFFSET_BITS")
9+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
10+ ENDIF(NOT CMAKE_CXX_FLAGS MATCHES "-D_FILE_OFFSET_BITS")
11 IF (UNIX AND NOT APPLE)
12 IF (NOT CMAKE_SHARED_LINKER_FLAGS MATCHES "as-needed")
13 SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
14
15=== modified file 'ChangeLog'
16--- ChangeLog 2012-04-10 15:41:57 +0000
17+++ ChangeLog 2012-04-12 09:40:25 +0000
18@@ -16,6 +16,7 @@
19 * Fixed bug #967428 (do not hoist index creation outside a try-catch)
20 * Fixed performance problem with the findNodeSources function of the no-copy rule
21 * Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
22+ * Fixed bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
23 * Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
24 * 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).
25

Subscribers

People subscribed via source and target branches