From ce351aa49b62d498403a55c90c38d6d24d900846 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 14 Aug 2005 16:27:48 +0000
Subject: add php5 package

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1667 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../php5/patches/php-5.0.4-configure-cross.patch   | 83 ++++++++++++++++++++++
 .../php5/patches/php-5.0.4-xml-expat-no-xml2.patch | 21 ++++++
 2 files changed, 104 insertions(+)
 create mode 100644 openwrt/package/php5/patches/php-5.0.4-configure-cross.patch
 create mode 100644 openwrt/package/php5/patches/php-5.0.4-xml-expat-no-xml2.patch

(limited to 'openwrt/package/php5/patches')

diff --git a/openwrt/package/php5/patches/php-5.0.4-configure-cross.patch b/openwrt/package/php5/patches/php-5.0.4-configure-cross.patch
new file mode 100644
index 0000000000..d4c423b3b0
--- /dev/null
+++ b/openwrt/package/php5/patches/php-5.0.4-configure-cross.patch
@@ -0,0 +1,83 @@
+--- php-5.0.4/configure	2005-06-16 19:23:10.000000000 +0200
++++ php-5.0.4-patched/configure	2005-07-01 23:52:04.000000000 +0200
+@@ -13851,7 +13851,7 @@
+     ac_libs=$LIBS
+     LIBS="$LIBS -ldl"
+     if test "$cross_compiling" = yes; then
+-  found=no
++  found=yes
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 13858 "configure"
+@@ -15724,7 +15724,7 @@
+ 
+ 		
+ 		if test "$cross_compiling" = yes; then
+-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 15731 "configure"
+@@ -16981,7 +16981,7 @@
+ if { (eval echo configure:16982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   if test "$cross_compiling" = yes; then
+-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++    { echo "configure: error: can not run test program while cross compiling" 1>&2; }
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 16988 "configure"
+@@ -17478,7 +17478,7 @@
+   rm -fr conftest*
+   
+   if test "$cross_compiling" = yes; then
+-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++    { echo "configure: error: can not run test program while cross compiling" 1>&2;  }
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 17485 "configure"
+@@ -41405,7 +41405,7 @@
+     echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
+ echo "configure:41407: checking if iconv supports errno" >&5
+     if test "$cross_compiling" = yes; then
+-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
++    { echo "configure: error: can not run test program while cross compiling" 1>&2;  }
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 41412 "configure"
+@@ -95618,7 +95618,7 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++sys_lib_search_path_spec=""
+ 
+ case $host_os in
+ aix3*)
+@@ -95828,7 +95828,7 @@
+   esac
+   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+   shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_search_path_spec=""
+   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+   ;;
+ 
+@@ -95878,7 +95878,7 @@
+     ;;
+   esac
+   sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_search_path_spec=""
+   ;;
+ 
+ netbsd*)
+@@ -96977,7 +96977,7 @@
+ link_all_deplibs=$link_all_deplibs
+ 
+ # Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++sys_lib_search_path_spec=
+ 
+ # Run-time system search path for libraries
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
diff --git a/openwrt/package/php5/patches/php-5.0.4-xml-expat-no-xml2.patch b/openwrt/package/php5/patches/php-5.0.4-xml-expat-no-xml2.patch
new file mode 100644
index 0000000000..e46e6506ff
--- /dev/null
+++ b/openwrt/package/php5/patches/php-5.0.4-xml-expat-no-xml2.patch
@@ -0,0 +1,21 @@
+diff -ruN php-5.0.4-old/configure php-5.0.4-new/configure
+--- php-5.0.4-old/configure	2005-04-03 11:42:50.000000000 +0200
++++ php-5.0.4-new/configure	2005-07-12 20:04:55.000000000 +0200
+@@ -87265,7 +87265,7 @@
+ 
+ if test "$PHP_XML" != "no" && test "$PHP_LIBXML" != "no" -o "$PHP_LIBEXPAT_DIR" != "no"; then
+         
+-
++if test "no" = "yes" ; then
+   for i in $PHP_LIBXML_DIR /usr/local /usr; do
+     if test -x "$i/bin/xml2-config"; then
+       XML2_CONFIG="$i/bin/xml2-config"
+@@ -87470,7 +87470,7 @@
+     fi
+   
+   fi
+-
++fi ## (line 87266)
+   
+         if test "$PHP_LIBEXPAT_DIR" != "no"; then
+     for i in $PHP_XML $PHP_LIBEXPAT_DIR; do
-- 
cgit v1.2.3