Zorba

Merge lp:~zorba-coders/zorba/fix_bug_1000895 into lp:zorba

  1. fix_bug_1000895
  2. Merge into trunk
Proposed by William Candillon
Status: Merged
Approved by: Paul J. Lucas
Approved revision: 10853
Merged at revision: 10853
Proposed branch: lp:~zorba-coders/zorba/fix_bug_1000895
Merge into: lp:zorba
Diff against target: 13 lines (+2/-1)
1 file modified
cmake_modules/FindPHP5.cmake (+2/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix_bug_1000895
Reviewer Review Type Date Requested Status
Paul J. Lucas Approve
William Candillon Approve
Review via email: mp+106312@code.launchpad.net

Commit message

Fix PHP build

Description of the change

Fix PHP build

To post a comment you must log in.
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Paul J. Lucas (paul-lucas) :
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/fix_bug_1000895-2012-05-18T07-21-08.572Z/log.html

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

Validation queue job fix_bug_1000895-2012-05-18T07-21-08.572Z 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 'cmake_modules/FindPHP5.cmake'
2--- cmake_modules/FindPHP5.cmake 2012-05-03 12:31:51 +0000
3+++ cmake_modules/FindPHP5.cmake 2012-05-18 06:23:19 +0000
4@@ -103,7 +103,8 @@
5 __zend_hash_add_or_update
6 _php_strtolower
7 _executor_globals
8- _call_user_function
9+ _call_user_function
10+ _php_sprintf
11 )
12 SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
13 "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS},-U,${symbol}")

Subscribers

People subscribed via source and target branches