Disable assembler parts under Mac OS X Intel to fix the build.

This commit is contained in:
tron 2008-01-05 21:14:10 +00:00
parent 0d1c33ab62
commit 32d2b5034f
2 changed files with 66 additions and 6 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.12 2006/12/08 22:06:28 joerg Exp $
$NetBSD: distinfo,v 1.13 2008/01/05 21:14:10 tron Exp $
SHA1 (avidemux_2.3.0.tar.gz) = 40a51db22593d910224dac91b512489a6af499fb
RMD160 (avidemux_2.3.0.tar.gz) = 1e10183d4b80104a42d40bfd9d9e9b5c54843d9e
@ -8,4 +8,4 @@ SHA1 (patch-ab) = f6e79bf9dfbae621c6fd07499ff74bfd14a57150
SHA1 (patch-ac) = 7872afd5a1eebd6bd57de65a1cfac1ac4e3149ee
SHA1 (patch-ad) = 3a0b32c90471d4589f50afca9495eff2b2b74fcb
SHA1 (patch-ae) = 275ffd524e25fd9f3d3f27b503eb092857a6045a
SHA1 (patch-af) = ffd7495651e50e7655630ec4fe1ded3a57c9961a
SHA1 (patch-af) = afa0e400f628aae53087307894979b3278eca87b

View file

@ -1,8 +1,8 @@
$NetBSD: patch-af,v 1.1 2006/12/08 22:06:28 joerg Exp $
$NetBSD: patch-af,v 1.2 2008/01/05 21:14:10 tron Exp $
--- configure.orig 2006-11-25 21:02:18.000000000 +0000
+++ configure
@@ -18971,7 +18971,7 @@ echo "${ECHO_T}$use_cygwin" >&6; }
+++ configure 2008-01-05 20:21:50.000000000 +0000
@@ -18971,7 +18971,7 @@
if test "x$use_cygwin" = "xyes"; then
LDFLAGS="$LDFLAGS -lpthreadGC1 "
else
@ -11,7 +11,37 @@ $NetBSD: patch-af,v 1.1 2006/12/08 22:06:28 joerg Exp $
fi
@@ -25715,7 +25715,7 @@ cat >>conftest.$ac_ext <<_ACEOF
@@ -25269,6 +25269,20 @@
have_little_endian=yes;
+case $host_os in
+darwin*)
+cat >>confdefs.h <<\_ACEOF
+#define FPM_INTEL 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define RUNTIME_CPUDETECT 1
+_ACEOF
+
+
+ ;;
+*)
cat >>confdefs.h <<\_ACEOF
#define ARCH_X86 1
_ACEOF
@@ -25290,6 +25304,8 @@
use_mmx=1
echo "X86 is ON"
+ ;;
+esac
;;
x86_64|amd64)
have_little_endian=yes;
@@ -25715,7 +25731,7 @@
#include <stdlib.h>
@ -20,3 +50,33 @@ $NetBSD: patch-af,v 1.1 2006/12/08 22:06:28 joerg Exp $
#error
#endif
@@ -26637,6 +26653,14 @@
case $ac_option in
# Handling of the options.
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ : Avoid regenerating within pkgsrc
+ exit 0
+ : Avoid regenerating within pkgsrc
+ exit 0
+ : Avoid regenerating within pkgsrc
+ exit 0
+ : Avoid regenerating within pkgsrc
+ exit 0
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
echo "$ac_cs_version"; exit ;;
@@ -28340,6 +28364,14 @@
case $ac_option in
# Handling of the options.
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+ : Avoid regenerating within pkgsrc
+ exit 0
+ : Avoid regenerating within pkgsrc
+ exit 0
+ : Avoid regenerating within pkgsrc
+ exit 0
+ : Avoid regenerating within pkgsrc
+ exit 0
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
echo "$ac_cs_version"; exit ;;