tags 542088 +patch thanks On Mon, 17 Aug 2009 15:17:04 -0500 Raphael Geissert <geiss...@debian.org> wrote:
> Yeah, I'm aware of that, I was going to make an upload with some changes > when it FTBFS. I have tried a couple of things to fix it, but nothing so > far. > > Anyone else from the team that could take a look at it? I really don't > think I'll have much time to try to fix it any time soon. The attached patch fixes the problem. Regards, Bradley Smith -- Bradley Smith b...@brad-smith.co.uk Debian GNU/Linux Developer bradsm...@debian.org GPG: 0xC718D347 D201 7274 2FE1 A92A C45C EFAB 8F70 629A C718 D347
Index: php5-5.2.10.dfsg.1/configure.in =================================================================== --- php5-5.2.10.dfsg.1.orig/configure.in 2009-08-20 19:21:44.000000000 +0100 +++ php5-5.2.10.dfsg.1/configure.in 2009-08-20 19:21:44.000000000 +0100 @@ -1,7 +1,7 @@ ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) +divert(1001) dnl ## Diversion 1 is the autoconf + automake setup phase. We also dnl ## set the PHP version, deal with platform-specific compile @@ -264,7 +264,7 @@ sinclude(main/suhosin_patch.m4) -divert(2) +divert(1002) dnl ## Diversion 2 is where we set PHP-specific options and come up dnl ## with reasonable default values for them. We check for pthreads here @@ -303,7 +303,7 @@ PTHREADS_FLAGS fi -divert(3) +divert(1003) dnl ## In diversion 3 we check for compile-time options to the PHP dnl ## core and how to deal with different system dependencies. @@ -662,7 +662,7 @@ PHP_CRYPT_R_STYLE fi -divert(4) +divert(1004) dnl ## In diversion 4 we check user-configurable general settings. @@ -903,7 +903,7 @@ AC_MSG_RESULT([using system default]) fi -divert(5) +divert(1005) dnl ## In diversion 5 we check which extensions should be compiled. dnl ## All of these are normally in the extension directories. Index: php5-5.2.10.dfsg.1/ext/standard/config.m4 =================================================================== --- php5-5.2.10.dfsg.1.orig/ext/standard/config.m4 2007-07-11 12:56:03.000000000 +0100 +++ php5-5.2.10.dfsg.1/ext/standard/config.m4 2009-08-20 19:21:44.000000000 +0100 @@ -1,6 +1,6 @@ dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*- -divert(3)dnl +divert(1003)dnl dnl dnl Check if flush should be called explicitly after buffered io @@ -205,7 +205,7 @@ AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan) AC_FUNC_FNMATCH -divert(5)dnl +divert(1005)dnl dnl dnl Check for regex library type Index: php5-5.2.10.dfsg.1/scripts/phpize.m4 =================================================================== --- php5-5.2.10.dfsg.1.orig/scripts/phpize.m4 2009-06-02 20:54:22.000000000 +0100 +++ php5-5.2.10.dfsg.1/scripts/phpize.m4 2009-08-20 19:21:44.000000000 +0100 @@ -1,6 +1,6 @@ dnl This file becomes configure.in for self-contained extensions. -divert(1) +divert(1001) AC_PREREQ(2.13) AC_INIT(config.m4)
signature.asc
Description: PGP signature
