[php-maint] Bug#652599: Bug#652599: php5: use_embedded_timezonedb.patch causes ext/date/lib/parse_tz.c to fail to compile

[Ondřej Surý]

It compiles correctly for me:

libtool: compile:  x86_64-linux-gnu-gcc -Iext/date/lib -Iext/date/
-I/tmp/buildd/php5-5.3.9/ext/date/ -DPHP_ATOM_INC
-I/tmp/buildd/php5-5.3.9/apache2-build/include
-I/tmp/buildd/php5-5.3.9/apache2-build/main -I/tmp/buildd/php5-5.3.9
-I/tmp/buildd/php5-5.3.9/apache2-build/ext/date/lib
-I/tmp/buildd/php5-5.3.9/ext/date/lib
-I/tmp/buildd/php5-5.3.9/ext/ereg/regex -I/usr/include/libxml2
-I/usr/include/enchant -I/usr/include/freetype2
-I/usr/include/c-client -I/tmp/buildd/php5-5.3.9/ext/mbstring/libmbfl
-I/tmp/buildd/php5-5.3.9/apache2-build/ext/mbstring/libmbfl
-I/tmp/buildd/php5-5.3.9/ext/mbstring/libmbfl/mbfl
-I/tmp/buildd/php5-5.3.9/apache2-build/ext/mbstring/libmbfl/mbfl
-I/usr/include/mysql -I/usr/include/postgresql -I/usr/include/pspell
-I/usr/include/tidy -I/tmp/buildd/php5-5.3.9/apache2-build/TSRM
-I/tmp/buildd/php5-5.3.9/apache2-build/Zend
-I/tmp/buildd/php5-5.3.9/main -I/tmp/buildd/php5-5.3.9/Zend
-I/tmp/buildd/php5-5.3.9/TSRM -I/tmp/buildd/php5-5.3.9/apache2-build/
-I/usr/include -O2 -Wall -fsigned-char -fno-strict-aliasing -gstabs
-fvisibility=hidden -c /tmp/buildd/php5-5.3.9/ext/date/lib/parse_tz.c
-fPIC -DPIC -o ext/date/lib/.libs/parse_tz.o

What is your build environment?

O.

On Mon, Dec 19, 2011 at 03:00, Dominic Scheirlinck <dominics at gmail.com> wrote:
> Package: php5
> Version: 5.3.8.0-1
> Severity: normal
>
> The quilt patch use_embedded_timezonedb.patch patches the
> timelib_parse_tzfile function within ext/date/lib/parse_tz.c to look
> like this:
>
>  http://paste.debian.net/149580/
>
> Specifically, the #ifdef ends before the closing brace of the 'if'
> block it introduces (and the 'else' a line below), causing compilation
> errors if HAVE_SYSTEM_TZDATA is not defined:
>
>  php5-5.3.8.0/ext/date/lib/parse_tz.c:875: error: expected identifier
> or ‘(’ before ‘else’
>  php5-5.3.8.0/ext/date/lib/parse_tz.c:879: error: expected identifier
> or ‘(’ before ‘return’
>  php5-5.3.8.0/ext/date/lib/parse_tz.c:880: error: expected identifier
> or ‘(’ before ‘}’ token
>
> It looks to me like the '#endif' belongs after the closing brace and
> 'else', and before the start of the else block.
>
>
>
> _______________________________________________
> pkg-php-maint mailing list
> pkg-php-maint at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-php-maint



-- 
Ondřej Surý <ondrej at sury.org>