From 27276da79d08bd88360ecde39db40d60d4ade820 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Tue, 11 Oct 2005 04:32:46 +0000
Subject: php: Add version 5.0.5 and 2 patches for it - the current libxml2
 build will not allow PHP5 to compile. --without-schemas has to be removes

---
 packages/php/php-5.0.5/autotools.patch | 90 ++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)
 create mode 100644 packages/php/php-5.0.5/autotools.patch

(limited to 'packages/php/php-5.0.5/autotools.patch')

diff --git a/packages/php/php-5.0.5/autotools.patch b/packages/php/php-5.0.5/autotools.patch
new file mode 100644
index 0000000000..7e466a425e
--- /dev/null
+++ b/packages/php/php-5.0.5/autotools.patch
@@ -0,0 +1,90 @@
+diff -Nur php-5.0.5~/acinclude.m4 php-5.0.5/acinclude.m4
+--- php-5.0.5~/acinclude.m4	2005-10-10 19:56:46.000000000 -0700
++++ php-5.0.5/acinclude.m4	2005-10-10 19:56:55.000000000 -0700
+@@ -781,10 +781,10 @@
+   OVERALL_TARGET=[]ifelse($1,,php,$1)
+   php_c_pre='$(CC)'
+   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+-  php_c_post=' && echo > $[@]'
++  php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
+   php_cxx_pre='$(CXX)'
+   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+-  php_cxx_post=' && echo > $[@]'
++  php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
+   php_lo=o
+ 
+   case $with_pic in
+@@ -1531,6 +1531,7 @@
+ 
+ 		dnl even newer glibcs have a different seeker definition...
+ 
++		AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
+ 		AC_TRY_RUN([
+ #define _GNU_SOURCE
+ #include <stdio.h>
+@@ -1560,8 +1561,8 @@
+ }
+ 
+ 					   ],
+-					   [ cookie_io_functions_use_off64_t=yes ],
+-					   [ ] )
++                                          [ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
++                                          [ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
+ 		
+       else
+   	    dnl older glibc versions (up to 2.1.2 ?)
+diff -Nur php-5.0.5~/configure.in php-5.0.5/configure.in
+--- php-5.0.5~/configure.in	2005-10-10 19:56:46.000000000 -0700
++++ php-5.0.5/configure.in	2005-10-10 19:56:55.000000000 -0700
+@@ -247,7 +247,7 @@
+ sinclude(Zend/acinclude.m4)
+ sinclude(Zend/Zend.m4)
+ sinclude(TSRM/tsrm.m4)
+-
++sinclude(TSRM/threads.m4)
+ 
+ 
+ divert(2)
+diff -Nur php-5.0.5~/scripts/phpize.m4 php-5.0.5/scripts/phpize.m4
+--- php-5.0.5~/scripts/phpize.m4	2005-10-10 19:56:46.000000000 -0700
++++ php-5.0.5/scripts/phpize.m4	2005-10-10 19:56:55.000000000 -0700
+@@ -1,7 +1,5 @@
+ dnl This file becomes configure.in for self-contained extensions.
+ 
+-AC_INIT(config.m4)
+-
+ PHP_INIT_BUILD_SYSTEM
+ 
+ AC_DEFUN([PHP_WITH_PHP_CONFIG],[
+@@ -55,8 +53,6 @@
+ PHP_PROG_RE2C
+ AC_PROG_AWK
+     
+-sinclude(config.m4)
+-
+ enable_static=no
+ enable_shared=yes
+ 
+diff -Nur php-5.0.5~/TSRM/threads.m4 php-5.0.5/TSRM/threads.m4
+--- php-5.0.5~/TSRM/threads.m4	2005-10-10 19:56:40.000000000 -0700
++++ php-5.0.5/TSRM/threads.m4	2005-10-10 19:57:11.000000000 -0700
+@@ -86,7 +86,7 @@
+   pthreads_working=no
+   ], [
+   dnl For cross compiling running this test is of no use. NetWare supports pthreads
+-  pthreads_working=no
++  pthreads_working=yes
+   case $host_alias in
+   *netware*)
+     pthreads_working=yes
+diff -Nur php-5.0.5~/TSRM/tsrm.m4 php-5.0.5/TSRM/tsrm.m4
+--- php-5.0.5~/TSRM/tsrm.m4	2005-10-10 19:56:40.000000000 -0700
++++ php-5.0.5/TSRM/tsrm.m4	2005-10-10 19:56:55.000000000 -0700
+@@ -68,7 +68,6 @@
+ ])
+ 
+ sinclude(threads.m4)
+-sinclude(TSRM/threads.m4)
+ 
+ AC_DEFUN([TSRM_CHECK_PTHREADS],[
+ 		
-- 
cgit v1.2.3