Skip to content

Commit a6c95c8

Browse files
committed
Reset LIBS temporarily to make sure PHP_CHECK_FUNC will look into libc.
See Gentoo bug #364139. https://bugs.gentoo.org/show_bug.cgi?id=364139 Reported by Naohiro Aota.
1 parent 8684fb7 commit a6c95c8

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ PHP NEWS
33
?? ??? 2012, PHP 5.3.12
44

55
?? ??? 2012, PHP 5.3.11
6+
- Iconv extension:
7+
. Fixed a bug that iconv extension fails to link to the correct library
8+
when another extension makes use of a library that links to the iconv
9+
library. See https://bugs.gentoo.org/show_bug.cgi?id=364139 for detail.
10+
(Moriyoshi)
611

712
(merge after 5.3.11 release)
813

acinclude.m4

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,7 +2438,12 @@ AC_DEFUN([PHP_SETUP_ICONV], [
24382438
dnl
24392439
dnl Check libc first if no path is provided in --with-iconv
24402440
dnl
2441+
24412442
if test "$PHP_ICONV" = "yes"; then
2443+
dnl Reset LIBS temporarily as it may have already been included
2444+
dnl -liconv in.
2445+
LIBS_save="$LIBS"
2446+
LIBS=
24422447
AC_CHECK_FUNC(iconv, [
24432448
found_iconv=yes
24442449
],[
@@ -2448,6 +2453,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
24482453
found_iconv=yes
24492454
])
24502455
])
2456+
LIBS="$LIBS_save"
24512457
fi
24522458
24532459
dnl

0 commit comments

Comments
 (0)