From f2a2c4cce60b6fda5541ac5cb945abe9958c93eb Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Tue, 26 Nov 2013 09:51:04 -0300 Subject: php: fix iconv related build failure Fix a rare edge build failure when iconv is enabled, easily reproduced in a debian chroot with an aarch64 external toolchain with iconv + xmlrpc support enabled with a php cgi + cli target. Should solve bug #6500. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/php/php-no-iconv-search.patch | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 package/php/php-no-iconv-search.patch (limited to 'package/php/php-no-iconv-search.patch') diff --git a/package/php/php-no-iconv-search.patch b/package/php/php-no-iconv-search.patch deleted file mode 100644 index d1e924b1ab..0000000000 --- a/package/php/php-no-iconv-search.patch +++ /dev/null @@ -1,21 +0,0 @@ -Don't push LDFLAGS/CFLAGS for iconv. -Just assume they're covered somewhere else. -Otherwise we get -L/usr/lib and -I/usr/include search paths with uClibc -internal iconv support, which breaks things. - -Signed-off-by: Gustavo Zacarias - -diff -Nura php-5.3.13/configure php-5.3.13-iconv/configure ---- php-5.3.13/configure 2012-05-08 06:41:23.000000000 -0300 -+++ php-5.3.13-iconv/configure 2012-05-18 22:18:21.313975849 -0300 -@@ -47885,8 +47885,8 @@ - PHP_ICONV_PREFIX="$ICONV_DIR" - fi - -- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" -- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" -+ #CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" -+ #LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" - - if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then - PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" -- cgit v1.2.3