bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] php5: upgrade to 5.3.8 and refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@28131 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mhei
2011-08-30 19:45:14 +00:00
parent 4eeb01d93e
commit 0d4ef37862
5 changed files with 26717 additions and 53479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lang/php5/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=php PKG_NAME:=php
PKG_VERSION:=5.3.6 PKG_VERSION:=5.3.8
PKG_RELEASE:=7 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.php.net/distributions/ PKG_SOURCE_URL:=http://www.php.net/distributions/
PKG_MD5SUM:=2286f5a82a6e8397955a0025c1c2ad98 PKG_MD5SUM:=704cd414a0565d905e1074ffdc1fadfb
PKG_FIXUP:=libtool no-autoreconf PKG_FIXUP:=libtool no-autoreconf
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

11
lang/php5/patches/100-fix_membar_producer_link_error_gcc41.patch
View File

@ -1,11 +0,0 @@
--- a/ext/standard/php_crypt_r.c
+++ b/ext/standard/php_crypt_r.c
@@ -94,7 +94,7 @@
if (!initialized) {
#ifdef PHP_WIN32
InterlockedIncrement(&initialized);
-#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2))
+#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1))
__sync_fetch_and_add(&initialized, 1);
#elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */
membar_producer();

6
lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch
View File

@ -1,8 +1,8 @@
--- a/ext/standard/php_crypt_r.c --- a/ext/standard/php_crypt_r.c
+++ b/ext/standard/php_crypt_r.c +++ b/ext/standard/php_crypt_r.c
@@ -96,6 +96,8 @@ void _crypt_extended_init_r(void) @@ -97,6 +97,8 @@ void _crypt_extended_init_r(void)
InterlockedIncrement(&initialized); #elif (defined(__GNUC__) && !defined(__hpux) && (__GNUC__ > 4 || \
#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1)) (__GNUC__ == 4 && (__GNUC_MINOR__ > 1 || (__GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ > 1)))))
__sync_fetch_and_add(&initialized, 1); __sync_fetch_and_add(&initialized, 1);
+#elif (defined(__GNUC__) && (__GNUC__ == 3)) +#elif (defined(__GNUC__) && (__GNUC__ == 3))
+ initialized = 1; + initialized = 1;

77779
lang/php5/patches/900-prevent_buildconf_force.patch
View File

File diff suppressed because it is too large Load Diff

4
lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch
View File

@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -15979,7 +15979,7 @@ @@ -16067,7 +16067,7 @@ fi
ac_libs=$LIBS ac_libs=$LIBS
LIBS="$LIBS -ldl" LIBS="$LIBS -ldl"
if test "$cross_compiling" = yes; then if test "$cross_compiling" = yes; then
@ -8,4 +8,4 @@
+ found=$found + found=$found
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 15986 "configure" #line 16074 "configure"