commit: afec44aa8765ddf8bf66aa82699be0f8b19bd05f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Sep 20 18:21:18 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Sep 20 18:26:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afec44aa
sys-devel/llvm: Add flag to control libfpm dep for exegesis Bug: https://bugs.gentoo.org/666617 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/arch/arm/package.use.mask | 5 +++++ profiles/arch/arm64/package.use.mask | 5 +++++ profiles/default/bsd/package.use.mask | 4 ++++ sys-devel/llvm/llvm-7.0.0.ebuild | 4 +++- sys-devel/llvm/llvm-7.0.9999.ebuild | 4 +++- sys-devel/llvm/llvm-9999.ebuild | 4 +++- sys-devel/llvm/metadata.xml | 2 ++ 7 files changed, 25 insertions(+), 3 deletions(-) diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index 71d46182774..cd87c3421d5 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Michał Górny <[email protected]> (20 Sep 2018) +# dev-libs/libpfm not keyworded here (and unclear if it supports ARM). +# Bug #666651. +sys-devel/llvm exegesis + # Andreas Sturmlechner <[email protected]> (01 Sep 2018) # media-libs/libaom not yet keyworded # media-libs/aribb24 not yet keyworded, bug #665048 diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask index 8a35eaf1ff6..643cc53cd61 100644 --- a/profiles/arch/arm64/package.use.mask +++ b/profiles/arch/arm64/package.use.mask @@ -1,6 +1,11 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Michał Górny <[email protected]> (20 Sep 2018) +# dev-libs/libpfm not keyworded here (and unclear if it supports ARM64). +# Bug #666651. +sys-devel/llvm exegesis + # Virgil Dupras <[email protected]> (06 Sep 2018) # sci-electronics/ngspice not yet keyworded, bug #665416 # sci-libs/oce not yet keyworded diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask index 884da6e0f60..694a108dd89 100644 --- a/profiles/default/bsd/package.use.mask +++ b/profiles/default/bsd/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Michał Górny <[email protected]> (20 Sep 2018) +# dev-libs/libpfm has broken install rules for FreeBSD. Bug #666649. +sys-devel/llvm exegesis + # Fabian Groffen <[email protected]> (07 Dec 2016) # unkeyworded notmuch dependency, bug #587560 mail-client/mutt notmuch diff --git a/sys-devel/llvm/llvm-7.0.0.ebuild b/sys-devel/llvm/llvm-7.0.0.ebuild index 9ce79663c29..ef47128aa16 100644 --- a/sys-devel/llvm/llvm-7.0.0.ebuild +++ b/sys-devel/llvm/llvm-7.0.0.ebuild @@ -33,12 +33,13 @@ LICENSE="UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )" SLOT="$(ver_cut 1)" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="debug doc gold libedit +libffi ncurses test xar xml +IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml kernel_Darwin ${ALL_LLVM_TARGETS[*]}" RESTRICT="!test? ( test )" RDEPEND=" sys-libs/zlib:0= + exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) @@ -111,6 +112,7 @@ multilib_src_configure() { -DLLVM_ENABLE_TERMINFO=$(usex ncurses) -DLLVM_ENABLE_LIBXML2=$(usex xml) -DLLVM_ENABLE_ASSERTIONS=$(usex debug) + -DLLVM_ENABLE_LIBPFM=$(usex exegesis) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON diff --git a/sys-devel/llvm/llvm-7.0.9999.ebuild b/sys-devel/llvm/llvm-7.0.9999.ebuild index 2777a3c503c..b97e3a6b47b 100644 --- a/sys-devel/llvm/llvm-7.0.9999.ebuild +++ b/sys-devel/llvm/llvm-7.0.9999.ebuild @@ -35,12 +35,13 @@ LICENSE="UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )" SLOT="$(ver_cut 1)" KEYWORDS="" -IUSE="debug doc gold libedit +libffi ncurses test xar xml +IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml kernel_Darwin ${ALL_LLVM_TARGETS[*]}" RESTRICT="!test? ( test )" RDEPEND=" sys-libs/zlib:0= + exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) @@ -111,6 +112,7 @@ multilib_src_configure() { -DLLVM_ENABLE_TERMINFO=$(usex ncurses) -DLLVM_ENABLE_LIBXML2=$(usex xml) -DLLVM_ENABLE_ASSERTIONS=$(usex debug) + -DLLVM_ENABLE_LIBPFM=$(usex exegesis) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 196984744a5..014336a4f3e 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -37,12 +37,13 @@ LICENSE="UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )" SLOT="8" KEYWORDS="" -IUSE="debug doc gold libedit +libffi ncurses test xar xml +IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml kernel_Darwin ${ALL_LLVM_TARGETS[*]}" RESTRICT="!test? ( test )" RDEPEND=" sys-libs/zlib:0= + exegesis? ( dev-libs/libpfm:= ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] ) @@ -139,6 +140,7 @@ multilib_src_configure() { -DLLVM_ENABLE_TERMINFO=$(usex ncurses) -DLLVM_ENABLE_LIBXML2=$(usex xml) -DLLVM_ENABLE_ASSERTIONS=$(usex debug) + -DLLVM_ENABLE_LIBPFM=$(usex exegesis) -DLLVM_ENABLE_EH=ON -DLLVM_ENABLE_RTTI=ON diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml index e3546184271..4538466dde0 100644 --- a/sys-devel/llvm/metadata.xml +++ b/sys-devel/llvm/metadata.xml @@ -14,6 +14,8 @@ <flag name="default-compiler-rt">Use compiler-rt instead of libgcc as the default rtlib for clang</flag> <flag name="default-libcxx">Use libc++ instead of libstdc++ as the default stdlib for clang</flag> <flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag> + <flag name="exegesis">Enable performance counter support for llvm-exegesis tool + that can be used to measure host machine instruction characteristics</flag> <flag name="gold">Build the gold linker plugin</flag> <flag name="lldb">Build the lldb debugger</flag> <flag name="multitarget">Build all host targets (default: host only)</flag>
