svn commit: r377341 - head/multimedia/ffmpeg25

[Thomas Zander]

Author: riggs
Date: Sun Jan 18 18:05:15 2015
New Revision: 377341
URL: https://svnweb.freebsd.org/changeset/ports/377341
QAT: https://qat.redports.org/buildarchive/r377341/

Log:
  Merge armv6 ASFLAGS fix from multimedia/ffmpeg in r377205

Modified:
  head/multimedia/ffmpeg25/Makefile   (contents, props changed)

Modified: head/multimedia/ffmpeg25/Makefile
==============================================================================
--- head/multimedia/ffmpeg25/Makefile	Sun Jan 18 18:04:33 2015	(r377340)
+++ head/multimedia/ffmpeg25/Makefile	Sun Jan 18 18:05:15 2015	(r377341)
@@ -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