Use yasm on i386 as well. From Matthias Drochner.

This commit is contained in:
joerg 2008-01-07 13:33:27 +00:00
parent d9f5e36421
commit f363319856
3 changed files with 13 additions and 8 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2008/01/04 18:41:54 joerg Exp $
# $NetBSD: Makefile,v 1.6 2008/01/07 13:33:27 joerg Exp $
#
SNAPSHOT_DATE= 20071218
@ -17,9 +17,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= nasm>=0.98.34:../../devel/nasm
.elif ${MACHINE_ARCH} == "x86_64"
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm
.endif

View file

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.4 2008/01/04 18:41:54 joerg Exp $
$NetBSD: distinfo,v 1.5 2008/01/07 13:33:28 joerg Exp $
SHA1 (x264-snapshot-20071218-2245.tar.bz2) = b5bc182070e17a8470618bae776488514b67a96a
RMD160 (x264-snapshot-20071218-2245.tar.bz2) = 753ab79398bf5bb92b41656ef48ab57dcc63f347
Size (x264-snapshot-20071218-2245.tar.bz2) = 537622 bytes
SHA1 (patch-aa) = 8c652d45621d2a3faed3d80a5eddb85fc1c96507
SHA1 (patch-aa) = cce1ef8b7a332e9f9a4c18a8a4246b9382dc4bca

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.3 2008/01/04 18:41:54 joerg Exp $
$NetBSD: patch-aa,v 1.4 2008/01/07 13:33:28 joerg Exp $
--- configure.orig 2007-12-18 22:45:04.000000000 +0100
+++ configure
@ -13,7 +13,14 @@ $NetBSD: patch-aa,v 1.3 2008/01/04 18:41:54 joerg Exp $
kfreebsd*-gnu)
SYS="FREEBSD"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
@@ -252,7 +256,7 @@ case $host_cpu in
@@ -245,14 +249,12 @@ case $host_cpu in
ASFLAGS="$ASFLAGS -f macho -DPREFIX"
elif [ "$SYS" = CYGWIN -o "$SYS" = MINGW ]; then
ASFLAGS="$ASFLAGS -f win32 -DPREFIX"
- elif [ "$SYS" = NETBSD ]; then
- ASFLAGS="$ASFLAGS -f aoutb"
else
ASFLAGS="$ASFLAGS -f elf"
fi
as_check || AS="nasm"
;;