diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2015-01-22 14:17:46 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-01-23 16:45:25 +0100 |
| commit | 9a4d760e1b0d3e4ff81f855486668952a20701df (patch) | |
| tree | 0b0ef29e73a4a9ac6bf5a2c1f6a1a0db6dfc6013 /package/php/php-01-no-iconv-search.patch | |
| parent | 626030fb1b9de47430254fce4dcf5ac5c526242f (diff) | |
| download | buildroot-9a4d760e1b0d3e4ff81f855486668952a20701df.tar.gz buildroot-9a4d760e1b0d3e4ff81f855486668952a20701df.zip | |
php: rename patches to new naming convention
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/php/php-01-no-iconv-search.patch')
| -rw-r--r-- | package/php/php-01-no-iconv-search.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/package/php/php-01-no-iconv-search.patch b/package/php/php-01-no-iconv-search.patch deleted file mode 100644 index 1979b7d0a5..0000000000 --- a/package/php/php-01-no-iconv-search.patch +++ /dev/null @@ -1,65 +0,0 @@ -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.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 ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- - 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 |
