diff options
| author | tnn <tnn@pkgsrc.org> | 2011-01-19 00:16:38 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2011-01-19 00:16:38 +0000 |
| commit | 8640aad169fd1e47ec0a49ff07616e53d6a09a43 (patch) | |
| tree | 81b49a9f15164577d49943c13befe5b06e0484d9 /multimedia/x264-devel | |
| parent | ceaceedca7b2495f4446845b1abb4f7528f08937 (diff) | |
| download | pkgsrc-8640aad169fd1e47ec0a49ff07616e53d6a09a43.tar.gz | |
Fails on current as well, so don't try to use asm there.
Someone who groks linker issues should try to make the asm code
position independent. Until then I suspect we will end up using
--disable-asm everywhere.
Diffstat (limited to 'multimedia/x264-devel')
| -rw-r--r-- | multimedia/x264-devel/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index bcac4ade2da..649be3657a1 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2011/01/17 23:13:46 tron Exp $ +# $NetBSD: Makefile,v 1.30 2011/01/19 00:16:38 tnn Exp $ SNAPSHOT_DATE= 20110101 @@ -25,16 +25,14 @@ CFLAGS+= -DHAVE_STDLIB_H # "libtool" to create shared libraries. We therefore need to switch # them off even if the C versions are slower. .if ${MACHINE_ARCH} == "i386" -. if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \ - (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) || \ +. if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" CONFIGURE_ARGS+= --disable-asm . else BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm . endif .elif ${MACHINE_ARCH} == "x86_64" -. if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && \ - (!empty(OS_VERSION:M[1-5].*) && empty(OS_VERSION:M5.99.*))) || \ +. if ${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" CONFIGURE_ARGS+= --disable-asm . else |