[SCM] libav/experimental: Check whether 32-bit x86 is really 64-bit Fixes configure on OS X 10.6

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:52:23 UTC 2013


The following commit has been merged in the experimental branch:
commit de27f4d95726aed333e8ef78fdfbc0b4357130d8
Author: David Conrad <lessen42 at gmail.com>
Date:   Thu Oct 1 21:38:25 2009 +0000

    Check whether 32-bit x86 is really 64-bit
    Fixes configure on OS X 10.6
    
    Originally committed as revision 20134 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 4e24df0..ab71cb3 100755
--- a/configure
+++ b/configure
@@ -1817,20 +1817,17 @@ case "$arch" in
         enable fast_64bit
         spic=$shared
     ;;
-    i386|i486|i586|i686|i86pc|BePC)
+    i386|i486|i586|i686|i86pc|BePC|x86_64|amd64)
         arch="x86"
         subarch="x86_32"
         enable fast_unaligned
-    ;;
-    x86_64|amd64)
-        arch="x86"
-        subarch="x86_32"
-        enable cmov
-        enable fast_cmov
-        enable fast_unaligned
         check_cc <<EOF && enable fast_64bit && subarch="x86_64" && spic=$shared
         int test[sizeof(char*) - 7];
 EOF
+        if test "$subarch" = "x86_64"; then
+            enable cmov
+            enable fast_cmov
+        fi
     ;;
     *)
         arch="unknown"

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list