Date: Fri, 7 Feb 2020 05:09:16 +0000 (UTC) From: Mikhail Teterin <mi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525461 - head/multimedia/x265 Message-ID: <202002070509.01759GVJ095536@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mi Date: Fri Feb 7 05:09:16 2020 New Revision: 525461 URL: https://svnweb.freebsd.org/changeset/ports/525461 Log: Add nasm to dependencies on ARM-platforms. Disable attempts to use assembly on PPC. Reported by: jbeich Modified: head/multimedia/x265/Makefile Modified: head/multimedia/x265/Makefile ============================================================================== --- head/multimedia/x265/Makefile Fri Feb 7 04:44:24 2020 (r525460) +++ head/multimedia/x265/Makefile Fri Feb 7 05:09:16 2020 (r525461) @@ -18,9 +18,10 @@ COMMENT= H.265/High Efficiency Video Coding (HEVC) for LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC:H}/COPYING +.for a in amd64 i386 aarch64 armv6 armv7 +BUILD_DEPENDS_$a= nasm:devel/nasm +.endfor BUILD_DEPENDS= ${BUILD_DEPENDS_${ARCH}} -BUILD_DEPENDS_amd64= nasm:devel/nasm -BUILD_DEPENDS_i386= nasm:devel/nasm USES= cmake compiler:c++14-lang pathfix @@ -81,7 +82,7 @@ CFLAGS:= ${CFLAGS:N-O*} -O0 -g .for b in ${OTHER_DEPTHS:C/HI([0-9]+)P/\1/} EXTRA_LINK_FLAGS+=-L${WRKSRC:H}/$bbit -.if ${ARCH} == i386 && $b != 8 +.if ${ARCH} == i386 && $b != 8 || ! ${BUILD_DEPENDS:Mnasm*} ASSEMBLY=false .else ASSEMBLY=true @@ -107,9 +108,10 @@ CMAKE_ARGS+= ${OTHER_DEPTHS:C/HI([0-9]+)P/-DLINKED_\1B CMAKE_ARGS+= -DENABLE_SHARED:BOOL=true -.if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" +.if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" || ! ${BUILD_DEPENDS:Mnasm*} CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=false .else +CMAKE_ARGS+= -DENABLE_ASSEMBLY:BOOL=true do-test: ${WRKDIR}/.build/test/TestBench .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002070509.01759GVJ095536>