diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-08-09 12:03:08 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-08-10 14:26:52 +0200 |
| commit | 6604b2e9c446ae85ae358bf1a9973c8c6f205edd (patch) | |
| tree | 10c3cb89cde746f0e54d50373c41cb4aa7722d8c /package/php/0002-iconv-tweak-iconv-detection.patch | |
| parent | 5e8b92cec64dbb0dfe57435d3333b359355e3267 (diff) | |
| download | buildroot-6604b2e9c446ae85ae358bf1a9973c8c6f205edd.tar.gz buildroot-6604b2e9c446ae85ae358bf1a9973c8c6f205edd.zip | |
php: rework patches as Git formatted patches
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/php/0002-iconv-tweak-iconv-detection.patch')
| -rw-r--r-- | package/php/0002-iconv-tweak-iconv-detection.patch | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/package/php/0002-iconv-tweak-iconv-detection.patch b/package/php/0002-iconv-tweak-iconv-detection.patch new file mode 100644 index 0000000000..a34664930b --- /dev/null +++ b/package/php/0002-iconv-tweak-iconv-detection.patch @@ -0,0 +1,69 @@ +From 1357df0196806d5697b1f84497ef72aab5faa8a3 Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <gustavo@zacarias.com.ar> +Date: Tue, 9 Aug 2016 11:50:49 +0200 +Subject: [PATCH] iconv: tweak iconv detection + +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. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +[Gustavo: convert to nice m4 instead of patching configure] +[Gustavo: update for 5.6.10] +--- + acinclude.m4 | 2 +- + ext/iconv/config.m4 | 22 ---------------------- + 2 files changed, 1 insertion(+), 23 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index af4aa06..1bd2652 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2471,7 +2471,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ + dnl + if test "$found_iconv" = "no"; then + +- for i in $PHP_ICONV /usr/local /usr; do ++ for i in $PHP_ICONV; do + if test -r $i/include/giconv.h; then + AC_DEFINE(HAVE_GICONV_H, 1, [ ]) + ICONV_DIR=$i +diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 +index 6a05697..694fcb8 100644 +--- a/ext/iconv/config.m4 ++++ b/ext/iconv/config.m4 +@@ -14,28 +14,6 @@ if test "$PHP_ICONV" != "no"; then + ]) + + 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 +- else +- 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 + + AC_MSG_CHECKING([if iconv is glibc's]) + AC_TRY_LINK([#include <gnu/libc-version.h>],[gnu_get_libc_version();], +-- +2.7.4 + |
