Mercurial > mplayer.hg

changeset 36215:4eb27365d0b0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add hack to fix compilation issues on OSX with broken libiconv. Such a hack is not really a good solution, but since the issue is relatively common it seems worth it for the moment.
author reimar
date Sun, 09 Jun 2013 13:54:47 +0000
parents fc128e175f72
children 36bf5f450577
files configure
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Jun 09 10:13:08 2013 +0000
+++ b/configure	Sun Jun 09 13:54:47 2013 +0000
@@ -3939,7 +3939,10 @@
 }
 EOF
   _iconv=no
-  for ld_tmp in "" "-liconv" "-liconv $ld_dl" ; do
+  # NOTE: -L/usr/lib is a hack to avoid issues due to a
+  # broken libiconv that e.g. macports installs into /opt/local/lib
+  # which might get addded to the search path later by e.g. SDL
+  for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
     cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
       ld_iconv="$ld_tmp" && _iconv=yes && break
   done