Mercurial > mplayer.hg
comparison configure @ 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 |
comparison
equal
deleted
inserted
replaced
34964:667130006055 | 34965:abcc6e6d67c9 |
---|---|
70 source="$1" | 70 source="$1" |
71 shift | 71 shift |
72 echo >> "$TMPLOG" | 72 echo >> "$TMPLOG" |
73 cat "$source" >> "$TMPLOG" | 73 cat "$source" >> "$TMPLOG" |
74 echo >> "$TMPLOG" | 74 echo >> "$TMPLOG" |
75 echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o $TMPEXE $@" >> "$TMPLOG" | 75 echo "$_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS $source $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -lm -o $TMPEXE $@" >> "$TMPLOG" |
76 rm -f "$TMPEXE" | 76 rm -f "$TMPEXE" |
77 $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1 | 77 $_cc $WARNFLAGS $WARN_CFLAGS $CFLAGS "$source" $extra_cflags $ld_static $extra_ldflags $libs_mplayer $libs_mencoder -lm -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1 |
78 TMPRES="$?" | 78 TMPRES="$?" |
79 echo >> "$TMPLOG" | 79 echo >> "$TMPLOG" |
80 echo >> "$TMPLOG" | 80 echo >> "$TMPLOG" |
81 return "$TMPRES" | 81 return "$TMPRES" |
82 } | 82 } |
1557 host_arch=$(echo $host_arch | tr '_' '-') | 1557 host_arch=$(echo $host_arch | tr '_' '-') |
1558 fi | 1558 fi |
1559 fi | 1559 fi |
1560 | 1560 |
1561 extra_cflags="-I. -Iffmpeg $extra_cflags" | 1561 extra_cflags="-I. -Iffmpeg $extra_cflags" |
1562 extra_ldflags="-lm $extra_ldflags" | |
1563 _timer=timer-linux.c | 1562 _timer=timer-linux.c |
1564 _getch=getch2.c | 1563 _getch=getch2.c |
1565 | 1564 |
1566 if darwin; then | 1565 if darwin; then |
1567 extra_cflags="-mdynamic-no-pic $extra_cflags" | 1566 extra_cflags="-mdynamic-no-pic $extra_cflags" |
7797 else | 7796 else |
7798 def_dvdnav='#undef CONFIG_DVDNAV' | 7797 def_dvdnav='#undef CONFIG_DVDNAV' |
7799 noinputmodules="dvdnav $noinputmodules" | 7798 noinputmodules="dvdnav $noinputmodules" |
7800 fi | 7799 fi |
7801 echores "$_dvdnav" | 7800 echores "$_dvdnav" |
7801 | |
7802 extra_ldflags="$extra_ldflags -lm" | |
7802 | 7803 |
7803 # DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check). | 7804 # DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check). |
7804 # Read dvdnav comment above. | 7805 # Read dvdnav comment above. |
7805 | 7806 |
7806 | 7807 |