aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorriggs <riggs@FreeBSD.org>2015-01-19 02:05:15 +0800
committerriggs <riggs@FreeBSD.org>2015-01-19 02:05:15 +0800
commit1c611af616b8a47fd80d43c2e554ae9f114a45e0 (patch)
tree4117a3ca0a9797a32ea2a3eec2bbd8235e7bda19 /multimedia
parent7d71fe5350f72375a0da8f482f0dd0fcef3c87e0 (diff)
downloadfreebsd-ports-graphics-1c611af616b8a47fd80d43c2e554ae9f114a45e0.tar.gz
freebsd-ports-graphics-1c611af616b8a47fd80d43c2e554ae9f114a45e0.tar.zst
freebsd-ports-graphics-1c611af616b8a47fd80d43c2e554ae9f114a45e0.zip
Merge armv6 ASFLAGS fix from multimedia/ffmpeg in r377205
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg25/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/multimedia/ffmpeg25/Makefile b/multimedia/ffmpeg25/Makefile
index 1dd398c11a5..4a74cbbb323 100644
--- a/multimedia/ffmpeg25/Makefile
+++ b/multimedia/ffmpeg25/Makefile
@@ -244,6 +244,10 @@ CONFIGURE_ARGS+= --enable-x11grab
.include <bsd.port.pre.mk>
+.if ${ARCH} == "armv6"
+CONFIGURE_ENV+= ASFLAGS=-no-integrated-as
+.endif
+
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin