backport r27763

SVN-Revision: 27770

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 4b4a00b1bcb758c6be3984e8ed663a6ddcc9cde1..138a140365be0102640f4c636a8ea4f6ae68183e 100644 (file)
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=5.3.6
-PKG_RELEASE:=3
+PKG_RELEASE:=3.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.php.net/distributions/

diff --git a/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch b/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch
new file mode 100644 (file)
index 0000000..81de7f8
--- /dev/null
+++ b/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch
@@ -0,0 +1,11 @@
+--- a/configure
++++ b/configure
+@@ -15979,7 +15979,7 @@
+     ac_libs=$LIBS
+     LIBS="$LIBS -ldl"
+     if test "$cross_compiling" = yes; then
+-  found=no
++  found=$found
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 15986 "configure"