diff options
| author | grant <grant> | 2006-10-11 00:04:39 +0000 |
|---|---|---|
| committer | grant <grant> | 2006-10-11 00:04:39 +0000 |
| commit | efcda27b6a5fcd8ce73ab42e60222e89bfc604c0 (patch) | |
| tree | 31d97e05d8e8349bc8884c9d659655e4ebe8fcb6 /multimedia | |
| parent | 7ebbfa6d30e49291ca7f72f60e65371edb3e7f6c (diff) | |
| download | pkgsrc-efcda27b6a5fcd8ce73ab42e60222e89bfc604c0.tar.gz | |
disable asm on Solaris, as the resulting object files don't link
correctly.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/xvidcore/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile index 9ad32cba5cd..b21f35c1a9f 100644 --- a/multimedia/xvidcore/Makefile +++ b/multimedia/xvidcore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2006/10/09 12:52:35 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2006/10/11 00:04:39 grant Exp $ DISTNAME= xvidcore-1.1.0 PKGREVISION= 3 @@ -14,10 +14,13 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../mk/bsd.prefs.mk" -.if ${MACHINE_ARCH} == "i386" -BUILD_DEPENDS+= nasm>=0.98.34:../../devel/nasm +# the resulting objects from the asm don't link correctly on Solaris. +.if ${OPSYS} == "SunOS" +CONFIGURE_ARGS+= --disable-assembly +.elif ${MACHINE_ARCH} == "i386" +BUILD_DEPENDS+= nasm>=0.98.34:../../devel/nasm .elif ${MACHINE_ARCH} == "x86_64" -BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm +BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm .endif PKG_INSTALLATION_TYPES= overwrite pkgviews |