php-01-no-iconv-search.patch 1.0 KB

1234567891011121314151617181920212223242526272829303132
  1. Just assume ICONV_DIR is fine since we pass the correct parameters
  2. to configure.
  3. Otherwise configure will try to guess on absolute directories and
  4. sometimes messes up on some weird edge conditions.
  5. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  6. diff -Nura php-5.3.27.orig/configure php-5.3.27/configure
  7. --- php-5.3.27.orig/configure 2013-11-26 09:33:30.874253800 -0300
  8. +++ php-5.3.27/configure 2013-11-26 09:41:41.495363637 -0300
  9. @@ -48212,20 +48212,7 @@
  10. if test "$iconv_avail" != "no"; then
  11. - if test -z "$ICONV_DIR"; then
  12. - for i in /usr/local /usr; do
  13. - if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
  14. - PHP_ICONV_PREFIX="$i"
  15. - break
  16. - fi
  17. - done
  18. - if test -z "$PHP_ICONV_PREFIX"; then
  19. - PHP_ICONV_PREFIX="/usr"
  20. - fi
  21. - else
  22. - PHP_ICONV_PREFIX="$ICONV_DIR"
  23. - fi
  24. -
  25. + PHP_ICONV_PREFIX="$ICONV_DIR"
  26. CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
  27. LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"