NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

php: fix more iconv related build failures

Browse Source 
See php-01-no-iconv.patch for the gory details. Fixes:
http://autobuild.buildroot.net/results/1c9/1c9bdfe55288430dca80a1bb514b85353d2f1c54/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Gustavo Zacarias 2014-04-22 22:12:14 -03:00 committed by Peter Korsgaard
parent 9b4a795f07
commit 771bc8e596
1 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
package/php/php-01-no-iconv-search.patch
View File

@ -1,32 +1,65 @@
Just assume ICONV_DIR is fine since we pass the correct parameters
to configure.
Otherwise configure will try to guess on absolute directories and
sometimes messes up on some weird edge conditions.
Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not
PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use
test instead of AC_TRY_LINK to find headers which is bad,
specially when adding /usr and /usr/local to the mix.
Do basically the same with ext/iconv/config.m4 by tweaking
PHP_ICONV_H_PATH which, again, uses test and absolute paths.
And all this directly in configure since autoreconf isn't
happy with php.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
diff -Nura php-5.3.27.orig/configure php-5.3.27/configure
--- php-5.3.27.orig/configure 2013-11-26 09:33:30.874253800 -0300
+++ php-5.3.27/configure 2013-11-26 09:41:41.495363637 -0300
@@ -48212,20 +48212,7 @@
diff -Nura php-5.5.11.orig/configure php-5.5.11/configure
--- php-5.5.11.orig/configure 2014-04-16 14:55:52.300838499 -0300
+++ php-5.5.11/configure 2014-04-22 21:54:01.499097295 -0300
@@ -45751,12 +45751,6 @@
if test -n "$unique" && test "`eval $cmd`" = "" ; then
eval "INCLUDEPATH$unique=set"
if test "$iconv_avail" != "no"; then
- if test -z "$ICONV_DIR"; then
- for i in /usr/local /usr; do
- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
- PHP_ICONV_PREFIX="$i"
- break
- fi
- done
- if test -z "$PHP_ICONV_PREFIX"; then
- PHP_ICONV_PREFIX="/usr"
- fi
- if test ""; then
- INCLUDES="-I$ai_p $INCLUDES"
- else
- PHP_ICONV_PREFIX="$ICONV_DIR"
- INCLUDES="$INCLUDES -I$ai_p"
- fi
-
+ PHP_ICONV_PREFIX="$ICONV_DIR"
CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
fi
fi
@@ -45786,14 +45780,7 @@
PHP_ICONV_PREFIX="$ICONV_DIR"
fi
- 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"
- else
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
- fi
+ PHP_ICONV_H_PATH="iconv.h"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
$as_echo_n "checking if iconv is glibc's... " >&6; }
@@ -46191,8 +46178,6 @@
ext_builddir=ext/iconv
ext_srcdir=$abs_srcdir/ext/iconv
- ac_extra=`echo "-I\"$PHP_ICONV_PREFIX/include\""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
-
if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
PHP_ICONV_SHARED=no
@@ -97419,12 +97404,6 @@
if test -n "$unique" && test "`eval $cmd`" = "" ; then
eval "INCLUDEPATH$unique=set"
- if test ""; then
- INCLUDES="-I$ai_p $INCLUDES"
- else
- INCLUDES="$INCLUDES -I$ai_p"
- fi
-
fi
fi