diff options
| author | jperkin <jperkin> | 2014-07-04 10:27:43 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2014-07-04 10:27:43 +0000 |
| commit | 339c5bab5477bcfe0835fc0a7550b651e33d065c (patch) | |
| tree | d641e42cd8dbdd03a06091d169c9df581b41ed14 | |
| parent | 6b58a384e7b60cbd87604d0ee76c001b7c3b492e (diff) | |
| download | pkgsrc-339c5bab5477bcfe0835fc0a7550b651e33d065c.tar.gz | |
Disable all assembly optimisations on SunOS, avoids having to chase down
all the various GENERAL_REGS failures and ensures portability.
| -rw-r--r-- | multimedia/ffmpeg010/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/ffmpeg010/Makefile.common | 9 |
2 files changed, 3 insertions, 11 deletions
diff --git a/multimedia/ffmpeg010/Makefile b/multimedia/ffmpeg010/Makefile index c1fd9695516..0ef4cd89d72 100644 --- a/multimedia/ffmpeg010/Makefile +++ b/multimedia/ffmpeg010/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/06/27 17:58:09 drochner Exp $ +# $NetBSD: Makefile,v 1.17 2014/07/04 10:27:43 jperkin Exp $ PKGNAME= ffmpeg010-20130731.${DISTVERSION} PKGREVISION= 2 @@ -44,9 +44,6 @@ CONFIGURE_ARGS+= --disable-asm .endif .endif -# "error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'" -CFLAGS.SunOS+= -DBROKEN_RELOCATIONS=1 - TEST_TARGET= check post-install: diff --git a/multimedia/ffmpeg010/Makefile.common b/multimedia/ffmpeg010/Makefile.common index f29876c0340..2882822edb5 100644 --- a/multimedia/ffmpeg010/Makefile.common +++ b/multimedia/ffmpeg010/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2013/08/03 09:22:58 obache Exp $ +# $NetBSD: Makefile.common,v 1.9 2014/07/04 10:27:43 jperkin Exp $ # used by multimedia/ffmpeg010/Makefile DISTNAME= ffmpeg-${DISTVERSION:S/-//g} @@ -57,12 +57,7 @@ CONFIGURE_ARGS+= --enable-pthreads CONFIGURE_ARGS+= --enable-gpl .if ${OPSYS} == "SunOS" -CONFIGURE_ARGS+= --disable-amd3dnow -CONFIGURE_ARGS+= --disable-amd3dnowext -CONFIGURE_ARGS+= --disable-mmx -CONFIGURE_ARGS+= --disable-mmx2 -CONFIGURE_ARGS+= --disable-sse -CONFIGURE_ARGS+= --disable-ssse3 +CONFIGURE_ARGS+= --disable-asm .else CONFIGURE_ARGS+= --enable-runtime-cpudetect .endif |