From owner-svn-ports-head@freebsd.org Tue Feb 23 09:35:50 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 23B4E56422A; Tue, 23 Feb 2021 09:35:50 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DlDSQ0X6mz4hd7; Tue, 23 Feb 2021 09:35:50 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04AEE17110; Tue, 23 Feb 2021 09:35:50 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11N9Zn1I094447; Tue, 23 Feb 2021 09:35:49 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11N9ZnQP094446; Tue, 23 Feb 2021 09:35:49 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202102230935.11N9ZnQP094446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 23 Feb 2021 09:35:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566384 - head/multimedia/ffmpeg X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/multimedia/ffmpeg X-SVN-Commit-Revision: 566384 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2021 09:35:50 -0000 Author: pkubaj Date: Tue Feb 23 09:35:49 2021 New Revision: 566384 URL: https://svnweb.freebsd.org/changeset/ports/566384 Log: multimedia/ffmpeg: use clang from ports with bfd on powerpc64 with LTO option Turns out that clang can build proper binaries when using LTO, if bfd is used instead of lld. LLVM from ports is necessary because LLVMgold.so is not present in base. Approved by: tier 2 blanket Modified: head/multimedia/ffmpeg/Makefile Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Tue Feb 23 09:30:06 2021 (r566383) +++ head/multimedia/ffmpeg/Makefile Tue Feb 23 09:35:49 2021 (r566384) @@ -626,10 +626,13 @@ DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAI DOC_DOCFILES= APIchanges *.txt PORTDOCS= * -.include +.include -.if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MLTO} -USE_GCC= yes +.if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MLTO} && ${CHOSEN_COMPILER_TYPE} == clang +CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} +CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} +LLD_UNSAFE= yes .endif post-install: @@ -638,4 +641,4 @@ post-install: (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ "${DOC_DOCFILES}" ${STAGEDIR}${DOCSDIR}) -.include +.include