merge of '6279441596d7826ca811822cd78f2118f9eb57e2'

     and 'e667f22b2fcceae83ed7110622269ddd2194a9b8'

9 files changed, 2 insertions, 96 deletions

diff --git a/packages/php/files/.mtn2git_empty b/packages/nonworking/php/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/php/files/.mtn2git_empty
+++ b/packages/nonworking/php/.mtn2git_empty
diff --git a/packages/nonworking/php/files/.mtn2git_empty b/packages/nonworking/php/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/nonworking/php/files/.mtn2git_empty
diff --git a/packages/php/files/autotools.patch b/packages/nonworking/php/files/autotools.patch
index 712b85b67a..712b85b67a 100644
--- a/packages/php/files/autotools.patch
+++ b/packages/nonworking/php/files/autotools.patch
diff --git a/packages/php/files/pear.patch b/packages/nonworking/php/files/pear.patch
index fc9ed05af0..fc9ed05af0 100644
--- a/packages/php/files/pear.patch
+++ b/packages/nonworking/php/files/pear.patch
diff --git a/packages/php/php-native_4.4.4.bb b/packages/nonworking/php/php-native_4.4.4.bb
index 84d1c667b5..84d1c667b5 100644
--- a/packages/php/php-native_4.4.4.bb
+++ b/packages/nonworking/php/php-native_4.4.4.bb
diff --git a/packages/php/php_4.4.4.bb b/packages/nonworking/php/php_4.4.4.bb
index 3000ad1fb6..3000ad1fb6 100644
--- a/packages/php/php_4.4.4.bb
+++ b/packages/nonworking/php/php_4.4.4.bb
diff --git a/packages/php/php-5.2.5/autotools.patch b/packages/php/php-5.2.5/autotools.patch
deleted file mode 100644
index 9f1289fd11..0000000000
--- a/packages/php/php-5.2.5/autotools.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -u'rNF^function' php-5.1.4~/acinclude.m4 php-5.1.4/acinclude.m4
---- php-5.1.4~/acinclude.m4	2006-04-10 08:17:36.000000000 -0400
-+++ php-5.1.4/acinclude.m4	2006-08-16 22:32:58.000000000 -0400
-@@ -818,10 +818,10 @@
-   OVERALL_TARGET=[]ifelse($1,,php,$1)
-   php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
--  php_c_post=
-+  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='$(LIBTOOL) --mode=compile $(CXX)'
-   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
--  php_cxx_post=
-+  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=lo
- 
-   case $with_pic in
-@@ -1670,6 +1670,7 @@
-       have_fopen_cookie=yes
- 
- 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>
-@@ -1702,10 +1703,11 @@
-   cookie_io_functions_use_off64_t=yes
- ], [
-   cookie_io_functions_use_off64_t=no
--], [
--  cookie_io_functions_use_off64_t=no
--])
--    
-+],
-+[ 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 -u'rNF^function' php-5.1.4~/configure.in php-5.1.4/configure.in
---- php-5.1.4~/configure.in	2006-05-03 19:30:02.000000000 -0400
-+++ php-5.1.4/configure.in	2006-08-16 20:39:19.000000000 -0400
-@@ -209,6 +209,7 @@
- 
- sinclude(Zend/Zend.m4)
- sinclude(TSRM/tsrm.m4)
-+sinclude(TSRM/threads.m4)
- 
- 
- divert(2)
-@@ -255,11 +255,6 @@
-   PTHREADS_FLAGS
- fi
-
--if test "$PHP_ENABLE_FASTCGI" = "yes"; then
--  PHP_CONFIGURE_PART(Running FastCGI checks)
--  sinclude(sapi/cgi/libfcgi/acinclude.m4)
--  sinclude(sapi/cgi/libfcgi/libfcgi.m4)
--fi
-
- divert(3)
-
-diff -u'rNF^function' php-5.1.4~/scripts/phpize.m4 php-5.1.4/scripts/phpize.m4
---- php-5.1.4~/scripts/phpize.m4	2006-04-10 08:16:17.000000000 -0400
-+++ php-5.1.4/scripts/phpize.m4	2006-08-16 20:39:19.000000000 -0400
-@@ -3,7 +3,6 @@
- divert(1)
- 
- AC_PREREQ(2.13)
--AC_INIT(config.m4)
- 
- PHP_CONFIG_NICE(config.nice)
- 
-@@ -69,8 +68,6 @@
- PHP_PROG_RE2C
- PHP_PROG_AWK
-     
--sinclude(config.m4)
--
- enable_static=no
- enable_shared=yes
- 
-diff -u'rNF^function' php-5.1.4~/TSRM/threads.m4 php-5.1.4/TSRM/threads.m4
---- php-5.1.4~/TSRM/threads.m4	2005-04-27 09:22:18.000000000 -0400
-+++ php-5.1.4/TSRM/threads.m4	2006-08-16 20:39:19.000000000 -0400
-@@ -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 --git a/packages/php/php.inc b/packages/php/php.inc
index 321034bee7..569a6cd12c 100644
--- a/packages/php/php.inc
+++ b/packages/php/php.inc
@@ -5,7 +5,6 @@ LICENSE = "PHP"
 DEPENDS = "zlib libxml2 mysql virtual/libiconv php-native"
 
 SRC_URI =     "http://us2.php.net/distributions/php-${PV}.tar.bz2\
-               file://autotools.patch;patch=1 \
                file://acinclude-xml2-config.patch;patch=1"
 
 inherit autotools
diff --git a/packages/php/php_5.1.4.bb b/packages/php/php_5.1.4.bb
index 47475daca9..e639bf5acf 100644
--- a/packages/php/php_5.1.4.bb
+++ b/packages/php/php_5.1.4.bb
@@ -2,6 +2,8 @@ require php.inc
 
 PR = "r3"
 
+SRC_URI += "file://autotools.patch;patch=1"
+
 inherit autotools
 
 export THREADS="pthread"