diff options
| author | Jo-Philipp Wich | 2011-07-30 00:25:40 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich | 2011-07-30 00:25:40 +0000 |
| commit | 0b2d1b1365e130543ee63b3717b8f0ab89f00c6a (patch) | |
| tree | cc35b12881d7acd9f68ac518e7b9ac73df7fb35d | |
| parent | 367f4cd34605b4b99868f5d4a47fe6df7a120917 (diff) | |
| download | packages-0b2d1b1365e130543ee63b3717b8f0ab89f00c6a.tar.gz | |
merge r27834
SVN-Revision: 27835
| -rw-r--r-- | lang/php5/Makefile | 2 | ||||
| -rw-r--r-- | lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 138a14036..fe1d34597 100644 --- 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.1 +PKG_RELEASE:=3.2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ diff --git a/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch b/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch new file mode 100644 index 000000000..b3f677f1a --- /dev/null +++ b/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch @@ -0,0 +1,11 @@ +--- a/ext/standard/php_crypt_r.c ++++ b/ext/standard/php_crypt_r.c +@@ -96,6 +96,8 @@ void _crypt_extended_init_r(void) + InterlockedIncrement(&initialized); + #elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1)) + __sync_fetch_and_add(&initialized, 1); ++#elif (defined(__GNUC__) && (__GNUC__ == 3)) ++ initialized = 1; + #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ + membar_producer(); + atomic_add_int(&initialized, 1); |