20854739 the phps do not build on s12-71 (missed php 5.2) s11-update
authorCraig Mohrman <craig.mohrman@oracle.com>
Thu, 23 Apr 2015 12:34:24 -0700
branchs11-update
changeset 4179 d3168ead33bd
parent 4178 c84c3c2938a6
child 4180 5cd36902893c
20854739 the phps do not build on s12-71 (missed php 5.2)
components/php-5_2/php-sapi/patches/70_php-ext-gd.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/php-5_2/php-sapi/patches/70_php-ext-gd.patch	Thu Apr 23 12:34:24 2015 -0700
@@ -0,0 +1,15 @@
+20854739 the phps do not build on s12-71
+This fix will not be sent upstream since this version has been EOF
+by the community.
+
+--- php-5.2.17/ext/gd/config.m4.orig	Thu Apr 16 10:01:23 2015
++++ php-5.2.17/ext/gd/config.m4	Thu Apr 16 10:02:17 2015
[email protected]@ -204,7 +204,7 @@
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/include/freetype2/freetype.h" || test -f "$i/include/freetype2/freetype/freetype.h"; then
+         FREETYPE2_DIR=$i
+         FREETYPE2_INC_DIR=$i/include/freetype2
+         break