Fix a code typo in PHP4 (patch FindPHP4_fix_typo.diff).
Thanks to Mathieu Malaterre for the patch. Closes: #722475
This commit is contained in:
parent
01e348a127
commit
4a008406a5
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -15,6 +15,8 @@ cmake (2.8.12-0r2) UNRELEASED; urgency=low
|
|||||||
(Closes: #710573)
|
(Closes: #710573)
|
||||||
* Remove the whole emacs compiled directory rather than just .elc file.
|
* Remove the whole emacs compiled directory rather than just .elc file.
|
||||||
Thanks to Kevin Ryde. (Closes: #710572)
|
Thanks to Kevin Ryde. (Closes: #710572)
|
||||||
|
* Fix a code typo in PHP4 (patch FindPHP4_fix_typo.diff). Thanks to Mathieu
|
||||||
|
Malaterre for the patch. (Closes: #722475)
|
||||||
|
|
||||||
-- Modestas Vainius <modax@debian.org> Sun, 03 Nov 2013 12:28:06 +0200
|
-- Modestas Vainius <modax@debian.org> Sun, 03 Nov 2013 12:28:06 +0200
|
||||||
|
|
||||||
|
21
debian/patches/FindPHP4_fix_typo.diff
vendored
Normal file
21
debian/patches/FindPHP4_fix_typo.diff
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
From: Mathieu Malaterre <malat@debian.org>
|
||||||
|
Subject: Typo in PHP find module
|
||||||
|
Forwarded: yes
|
||||||
|
Origin: other
|
||||||
|
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722475
|
||||||
|
Reviewed-by: Modestas Vainius <modax@debian.org>
|
||||||
|
|
||||||
|
There is a missing CACHE keyword which make the set() command produce improper
|
||||||
|
result in FindPHP4
|
||||||
|
|
||||||
|
--- a/Modules/FindPHP4.cmake
|
||||||
|
+++ b/Modules/FindPHP4.cmake
|
||||||
|
@@ -40,7 +40,7 @@ if(PHP4_FOUND_INCLUDE_PATH)
|
||||||
|
foreach(php4_path Zend main TSRM)
|
||||||
|
set(php4_paths ${php4_paths} "${PHP4_FOUND_INCLUDE_PATH}/${php4_path}")
|
||||||
|
endforeach()
|
||||||
|
- set(PHP4_INCLUDE_PATH "${php4_paths}" INTERNAL "PHP4 include paths")
|
||||||
|
+ set(PHP4_INCLUDE_PATH "${php4_paths}" CACHE INTERNAL "PHP4 include paths")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
find_program(PHP4_EXECUTABLE NAMES php4 php )
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -3,3 +3,4 @@ multiarch_findgtk2_fix.diff
|
|||||||
install_to_multiarch_libdir_on_kfreebsd_hurd.diff
|
install_to_multiarch_libdir_on_kfreebsd_hurd.diff
|
||||||
multiarch-python-include-dirs.diff
|
multiarch-python-include-dirs.diff
|
||||||
qt_import_dir_variable.diff
|
qt_import_dir_variable.diff
|
||||||
|
FindPHP4_fix_typo.diff
|
||||||
|
Loading…
x
Reference in New Issue
Block a user