mirror of https://github.com/mpv-player/mpv
Handle "tail" and "head" properly. If using "-1" does not work then use "-n 1". Throw away warnings in both cases.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13896 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e18ba689db
commit
6cb6669552
|
@ -539,14 +539,28 @@ if darwin; then
|
||||||
_ldd="otool -L"
|
_ldd="otool -L"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Check how to call 'head' and 'tail'. Newer versions spit out warnings
|
||||||
|
# if used as 'head -1' instead of 'head -n 1', but older versions don't
|
||||||
|
# know about '-n'.
|
||||||
|
if test "`(echo line1 ; echo line2) | head -1 2>/dev/null`" = "line1" ; then
|
||||||
|
_head() { head -$1 2>/dev/null ; }
|
||||||
|
else
|
||||||
|
_head() { head -n $1 2>/dev/null ; }
|
||||||
|
fi
|
||||||
|
if test "`(echo line1 ; echo line2) | tail -1 2>/dev/null`" = "line2" ; then
|
||||||
|
_tail() { tail -$1 2>/dev/null ; }
|
||||||
|
else
|
||||||
|
_tail() { tail -n $1 2>/dev/null ; }
|
||||||
|
fi
|
||||||
|
|
||||||
# Checking CC version...
|
# Checking CC version...
|
||||||
if test "$_skip_cc_check" != yes ; then
|
if test "$_skip_cc_check" != yes ; then
|
||||||
# Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)
|
# Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)
|
||||||
if test "`basename $_cc`" = "icc" || test "`basename $_cc`" = "ecc"; then
|
if test "`basename $_cc`" = "icc" || test "`basename $_cc`" = "ecc"; then
|
||||||
echocheck "$_cc version"
|
echocheck "$_cc version"
|
||||||
cc_vendor=intel
|
cc_vendor=intel
|
||||||
cc_name=`( $_cc -V ) 2>&1 | head -1 | cut -d ',' -f 1`
|
cc_name=`( $_cc -V ) 2>&1 | _head 1 | cut -d ',' -f 1`
|
||||||
cc_version=`( $_cc -V ) 2>&1 | head -1 | cut -d ',' -f 2 | cut -d ' ' -f 3`
|
cc_version=`( $_cc -V ) 2>&1 | _head 1 | cut -d ',' -f 2 | cut -d ' ' -f 3`
|
||||||
_cc_major=`echo $cc_version | cut -d '.' -f 1`
|
_cc_major=`echo $cc_version | cut -d '.' -f 1`
|
||||||
_cc_minor=`echo $cc_version | cut -d '.' -f 2`
|
_cc_minor=`echo $cc_version | cut -d '.' -f 2`
|
||||||
# TODO verify older icc/ecc compatibility
|
# TODO verify older icc/ecc compatibility
|
||||||
|
@ -569,7 +583,7 @@ if test "$_skip_cc_check" != yes ; then
|
||||||
for _cc in "$_cc" gcc gcc-3.4 gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
|
for _cc in "$_cc" gcc gcc-3.4 gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
|
||||||
echocheck "$_cc version"
|
echocheck "$_cc version"
|
||||||
cc_vendor=gnu
|
cc_vendor=gnu
|
||||||
cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
|
cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
|
||||||
cc_version=`( $_cc -dumpversion ) 2>&1`
|
cc_version=`( $_cc -dumpversion ) 2>&1`
|
||||||
if test "$?" -gt 0; then
|
if test "$?" -gt 0; then
|
||||||
cc_version="not found"
|
cc_version="not found"
|
||||||
|
@ -684,9 +698,9 @@ fi
|
||||||
|
|
||||||
x86_exts_check()
|
x86_exts_check()
|
||||||
{
|
{
|
||||||
pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1`
|
pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | _head 1`
|
||||||
if test -z "$pparam" ; then
|
if test -z "$pparam" ; then
|
||||||
pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -1`
|
pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | _head 1`
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_mmx=no
|
_mmx=no
|
||||||
|
@ -715,11 +729,11 @@ case "$host_arch" in
|
||||||
_def_arch="#define ARCH_X86 1"
|
_def_arch="#define ARCH_X86 1"
|
||||||
_target_arch="TARGET_ARCH_X86 = yes"
|
_target_arch="TARGET_ARCH_X86 = yes"
|
||||||
|
|
||||||
pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
|
pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
|
||||||
pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
|
pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
|
||||||
pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
|
pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
|
||||||
pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
|
pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
|
||||||
pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
|
pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
|
||||||
|
|
||||||
x86_exts_check
|
x86_exts_check
|
||||||
|
|
||||||
|
@ -980,7 +994,7 @@ EOF
|
||||||
|
|
||||||
echocheck "CPU type"
|
echocheck "CPU type"
|
||||||
if linux && test -n "$_cpuinfo"; then
|
if linux && test -n "$_cpuinfo"; then
|
||||||
proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | head -1`
|
proc=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ',' -f 1 | cut -b 2- | _head 1`
|
||||||
if test -n "`$_cpuinfo | grep altivec`"; then
|
if test -n "`$_cpuinfo | grep altivec`"; then
|
||||||
_altivec=yes
|
_altivec=yes
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue