Mercurial > mplayer.hg
changeset 34965:abcc6e6d67c9
Try to fix -lm handling in configure.
Static linking for some libraries was broken because -lm
was not at the end of the linking options.
This may have been a regression.
| author | cehoyos |
|---|---|
| date | Sun, 05 Aug 2012 16:51:43 +0000 |
| parents | 667130006055 |
| children | c77eb6f184a2 |
| files | configure |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Aug 04 23:00:58 2012 +0000 +++ b/configure Sun Aug 05 16:51:43 2012 +0000 @@ -72,9 +72,9 @@ echo >> "$TMPLOG" cat "$source" >> "$TMPLOG" echo >> "$TMPLOG" - echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG" + echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -lm -o $TMPEXE $@" >> "$TMPLOG" rm -f "$TMPEXE" - $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1 + $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -lm -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1 TMPRES="$?" echo >> "$TMPLOG" echo >> "$TMPLOG" @@ -1559,7 +1559,6 @@ fi extra_cflags="-I. -Iffmpeg $extra_cflags" -extra_ldflags="-lm $extra_ldflags" _timer=timer-linux.c _getch=getch2.c @@ -7800,6 +7799,8 @@ fi echores "$_dvdnav" +extra_ldflags="$extra_ldflags -lm" + # DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check). # Read dvdnav comment above.