svn commit: r391821 - head/multimedia/ffmpeg

Thomas Zander riggs at FreeBSD.org
Sun Jul 12 16:35:59 UTC 2015


Author: riggs
Date: Sun Jul 12 16:35:58 2015
New Revision: 391821
URL: https://svnweb.freebsd.org/changeset/ports/391821

Log:
  Fix build break when compiling with gcc
  
  PR:		200714
  Submitted by:	rwestlun at gmail.com

Modified:
  head/multimedia/ffmpeg/Makefile

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Sun Jul 12 16:23:28 2015	(r391820)
+++ head/multimedia/ffmpeg/Makefile	Sun Jul 12 16:35:58 2015	(r391821)
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/ya
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
-USES=		cpe gmake pkgconfig perl5 tar:bzip2
+USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 WANT_SDL=	yes
@@ -245,8 +245,10 @@ CONFIGURE_ARGS+=	--enable-memalign-hack
 .endif
 
 .if ${ARCH} == "armv6"
+.if ${CHOSEN_COMPILER_TYPE} == "clang"
 CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
 .endif
+.endif
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}


More information about the svn-ports-all mailing list