From 5c459408bd55cb3fcd50e9e597717f4b439a9219 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 21:22:44 +0000 Subject: Do not use FreeBSD's cpuinfo file on x86_64 either, as on x86_32 it will not report 3Dnow availability. Patch from FreeBSD ports. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30270 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 0a4bfd2487..aea70b86b7 100755 --- a/configure +++ b/configure @@ -1648,9 +1648,10 @@ if test "$_runtime_cpudetection" = no ; then if test -r /proc/cpuinfo && ! cygwin; then # Linux with /proc mounted, extract CPU information from it _cpuinfo="cat /proc/cpuinfo" -elif test -r /compat/linux/proc/cpuinfo && ! x86_32 ; then +elif test -r /compat/linux/proc/cpuinfo && ! x86 ; then # FreeBSD with Linux emulation /proc mounted, # extract CPU information from it + # Don't use it on x86 though, it never reports 3Dnow _cpuinfo="cat /compat/linux/proc/cpuinfo" elif darwin && ! x86 ; then # use hostinfo on Darwin -- cgit v1.2.3 From fe2e888fd6a6658c7a4c8ba317e3f06a9c65ce62 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 10 Jan 2010 21:47:50 +0000 Subject: Search X11 headers and libraries also in /usr/local/..., should ease compilation on FreeBSD. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30271 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure') diff --git a/configure b/configure index aea70b86b7..fb69ac87ef 100755 --- a/configure +++ b/configure @@ -4223,7 +4223,7 @@ echocheck "X11 headers presence" fi done if test $_cross_compile = no; then - for I in /usr/X11/include /usr/X11R7/include /usr/X11R6/include \ + for I in /usr/X11/include /usr/X11R7/include /usr/local/include /usr/X11R6/include \ /usr/include/X11R6 /usr/openwin/include ; do if test -f "$I/X11/Xlib.h" ; then extra_cflags="$extra_cflags -I$I" @@ -4243,8 +4243,8 @@ if test "$_x11" = auto && test "$_x11_headers" = yes ; then #include int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; } EOF - for I in "" -L/usr/X11R7/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \ - -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 \ + for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \ + -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \ -L/usr/lib ; do if netbsd; then _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)" -- cgit v1.2.3 From 04fde0d9368c7223ccedec6faf2016385d74fca2 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 12 Jan 2010 19:41:44 +0000 Subject: Add checks for exp2, exp2 and log2f required by FFmpeg. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30291 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index fb69ac87ef..23da910acb 100755 --- a/configure +++ b/configure @@ -3006,7 +3006,7 @@ if test "$_posix4" = yes ; then fi echores "$_posix4" -for func in llrint log2 lrint lrintf round roundf truncf; do +for func in exp2 exp2f llrint log2 log2f lrint lrintf round roundf truncf; do echocheck $func cat > $TMPC << EOF #include @@ -8682,12 +8682,15 @@ $def_winsock2_h /* system functions */ +$def_exp2 +$def_exp2f $def_gethostbyname2 $def_gettimeofday $def_glob $def_langinfo $def_llrint $def_log2 +$def_log2f $def_lrint $def_lrintf $def_map_memalign -- cgit v1.2.3 From 977a21bea552d622c38db7ccf0bf20264a127e8d Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 12 Jan 2010 21:12:23 +0000 Subject: Change -pipe check to avoid misdetecting it as available for Sun's compiler. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30295 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 23da910acb..a849f32376 100755 --- a/configure +++ b/configure @@ -2415,7 +2415,8 @@ echocheck "assembler support of -pipe option" cat > $TMPC << EOF int main(void) { return 0; } EOF -cc_check -pipe && _pipe="-pipe" && echores "yes" || echores "no" +# -I. helps to detect compilers that just misunderstand -pipe like Sun C +cc_check -pipe -I. && _pipe="-pipe" && echores "yes" || echores "no" echocheck "compiler support of named assembler arguments" -- cgit v1.2.3 From 59fa6f549aebd49056e37c1bf26d429b71ef84ad Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 12 Jan 2010 21:16:01 +0000 Subject: Add very experimetal support for the Sun C compiler. To actually work, all "packed" attributes have to be replaced by equivalent pragmas and make DEPS=no must be used to compile. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30296 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index a849f32376..3dab6bab0c 100755 --- a/configure +++ b/configure @@ -1567,7 +1567,7 @@ if test "$(basename $_cc)" = "icc" || test "$(basename $_cc)" = "ecc"; then esac echores "$cc_version" else - for _cc in "$_cc" cc gcc ; do + for _cc in "$_cc" gcc cc ; do cc_name_tmp=$($_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1) if test "$cc_name_tmp" = "gcc"; then cc_name=$cc_name_tmp @@ -1587,6 +1587,15 @@ else echores "$cc_version" break fi + cc_name_tmp=$($_cc -V 2>&1 | head -n 1 | cut -d ' ' -f 2,3) + if test "$cc_name_tmp" = "Sun C"; then + echocheck "$_cc version" + cc_vendor=sun + cc_version=$($_cc -V 2>&1 | head -n 1 | cut -d ' ' -f 4) + _res_comment="experimental support only" + echores "Sun C $cc_version" + break + fi done fi # icc test "$cc_fail" = yes && die "unsupported compiler version" @@ -2457,6 +2466,8 @@ if test "$_profile" != "" || test "$_debug" != "" ; then elif test -z "$CFLAGS" ; then if test "$cc_vendor" = "intel" ; then CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer -wd167 -wd556 -wd144" + elif test "$cc_vendor" = "sun" ; then + CFLAGS="-O2 $_march $_mcpu $_pipe -xc99 -xregs=frameptr" elif test "$cc_vendor" != "gnu" ; then CFLAGS="-O2 $_march $_mcpu $_pipe" else -- cgit v1.2.3