Zorba

Merge lp:~zorba-coders/zorba/php-fix-build into lp:zorba

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

Commit message

Fix the mac build with the PHP binding

Description of the change

Fix the mac build with the PHP binding

To post a comment you must log in.
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

No approved revision specified.

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/php-fix-build-2012-04-19T17-01-05.802Z/log.html

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

Validation queue job php-fix-build-2012-04-19T17-01-05.802Z 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-04-16 20:56:43 +0000
3+++ cmake_modules/FindPHP5.cmake 2012-04-19 16:46:22 +0000
4@@ -102,6 +102,8 @@
5 __object_init
6 __zend_hash_add_or_update
7 _php_strtolower
8+ _executor_globals
9+ _call_user_function
10 )
11 SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
12 "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS},-U,${symbol}")

Subscribers

People subscribed via source and target branches