From ab79cf8bc78d3ddcc6ce8ee65ee12616beccbb28 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 11 Mar 2013 14:16:51 +0000 Subject: [PATCH] php4: add compatibility fix for gmp gmp modified some if it's internal constants, in particular __GMP_BITS_PER_MP_LIMB. Added a patch to substitute GMP_LIMB_BITS. Also bumped release number and copyright date. Signed-off-by: Russell Senior Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/packages@35955 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- lang/php4/Makefile | 4 ++-- lang/php4/patches/120-gmp-compat.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 lang/php4/patches/120-gmp-compat.patch diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 2ba1bf3ab..78c1c50ab 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php4 PKG_VERSION:=4.4.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=php-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ diff --git a/lang/php4/patches/120-gmp-compat.patch b/lang/php4/patches/120-gmp-compat.patch new file mode 100644 index 000000000..76672c301 --- /dev/null +++ b/lang/php4/patches/120-gmp-compat.patch @@ -0,0 +1,11 @@ +--- a/ext/gmp/gmp.c ++++ b/ext/gmp/gmp.c +@@ -1159,7 +1159,7 @@ ZEND_FUNCTION(gmp_random) + + GMPG(rand_initialized) = 1; + } +- mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); ++ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); + + ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp); + } -- 2.11.0