Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/arm/, profiles/arch/arm64/, sys-devel/llvm/, profiles/default/bsd/
Date: Thu, 20 Sep 2018 18:26:42
Message-Id: 1537467986.afec44aa8765ddf8bf66aa82699be0f8b19bd05f.mgorny@gentoo
1 commit: afec44aa8765ddf8bf66aa82699be0f8b19bd05f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 20 18:21:18 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 20 18:26:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afec44aa
7
8 sys-devel/llvm: Add flag to control libfpm dep for exegesis
9
10 Bug: https://bugs.gentoo.org/666617
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/arch/arm/package.use.mask | 5 +++++
14 profiles/arch/arm64/package.use.mask | 5 +++++
15 profiles/default/bsd/package.use.mask | 4 ++++
16 sys-devel/llvm/llvm-7.0.0.ebuild | 4 +++-
17 sys-devel/llvm/llvm-7.0.9999.ebuild | 4 +++-
18 sys-devel/llvm/llvm-9999.ebuild | 4 +++-
19 sys-devel/llvm/metadata.xml | 2 ++
20 7 files changed, 25 insertions(+), 3 deletions(-)
21
22 diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
23 index 71d46182774..cd87c3421d5 100644
24 --- a/profiles/arch/arm/package.use.mask
25 +++ b/profiles/arch/arm/package.use.mask
26 @@ -1,6 +1,11 @@
27 # Copyright 1999-2018 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29
30 +# Michał Górny <mgorny@g.o> (20 Sep 2018)
31 +# dev-libs/libpfm not keyworded here (and unclear if it supports ARM).
32 +# Bug #666651.
33 +sys-devel/llvm exegesis
34 +
35 # Andreas Sturmlechner <asturm@g.o> (01 Sep 2018)
36 # media-libs/libaom not yet keyworded
37 # media-libs/aribb24 not yet keyworded, bug #665048
38
39 diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
40 index 8a35eaf1ff6..643cc53cd61 100644
41 --- a/profiles/arch/arm64/package.use.mask
42 +++ b/profiles/arch/arm64/package.use.mask
43 @@ -1,6 +1,11 @@
44 # Copyright 1999-2018 Gentoo Foundation
45 # Distributed under the terms of the GNU General Public License v2
46
47 +# Michał Górny <mgorny@g.o> (20 Sep 2018)
48 +# dev-libs/libpfm not keyworded here (and unclear if it supports ARM64).
49 +# Bug #666651.
50 +sys-devel/llvm exegesis
51 +
52 # Virgil Dupras <vdupras@g.o> (06 Sep 2018)
53 # sci-electronics/ngspice not yet keyworded, bug #665416
54 # sci-libs/oce not yet keyworded
55
56 diff --git a/profiles/default/bsd/package.use.mask b/profiles/default/bsd/package.use.mask
57 index 884da6e0f60..694a108dd89 100644
58 --- a/profiles/default/bsd/package.use.mask
59 +++ b/profiles/default/bsd/package.use.mask
60 @@ -1,6 +1,10 @@
61 # Copyright 1999-2018 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63
64 +# Michał Górny <mgorny@g.o> (20 Sep 2018)
65 +# dev-libs/libpfm has broken install rules for FreeBSD. Bug #666649.
66 +sys-devel/llvm exegesis
67 +
68 # Fabian Groffen <grobian@g.o> (07 Dec 2016)
69 # unkeyworded notmuch dependency, bug #587560
70 mail-client/mutt notmuch
71
72 diff --git a/sys-devel/llvm/llvm-7.0.0.ebuild b/sys-devel/llvm/llvm-7.0.0.ebuild
73 index 9ce79663c29..ef47128aa16 100644
74 --- a/sys-devel/llvm/llvm-7.0.0.ebuild
75 +++ b/sys-devel/llvm/llvm-7.0.0.ebuild
76 @@ -33,12 +33,13 @@ LICENSE="UoI-NCSA rc BSD public-domain
77 llvm_targets_ARM? ( LLVM-Grant )"
78 SLOT="$(ver_cut 1)"
79 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
80 -IUSE="debug doc gold libedit +libffi ncurses test xar xml
81 +IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
82 kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
83 RESTRICT="!test? ( test )"
84
85 RDEPEND="
86 sys-libs/zlib:0=
87 + exegesis? ( dev-libs/libpfm:= )
88 gold? ( >=sys-devel/binutils-2.22:*[cxx] )
89 libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
90 libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
91 @@ -111,6 +112,7 @@ multilib_src_configure() {
92 -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
93 -DLLVM_ENABLE_LIBXML2=$(usex xml)
94 -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
95 + -DLLVM_ENABLE_LIBPFM=$(usex exegesis)
96 -DLLVM_ENABLE_EH=ON
97 -DLLVM_ENABLE_RTTI=ON
98
99
100 diff --git a/sys-devel/llvm/llvm-7.0.9999.ebuild b/sys-devel/llvm/llvm-7.0.9999.ebuild
101 index 2777a3c503c..b97e3a6b47b 100644
102 --- a/sys-devel/llvm/llvm-7.0.9999.ebuild
103 +++ b/sys-devel/llvm/llvm-7.0.9999.ebuild
104 @@ -35,12 +35,13 @@ LICENSE="UoI-NCSA rc BSD public-domain
105 llvm_targets_ARM? ( LLVM-Grant )"
106 SLOT="$(ver_cut 1)"
107 KEYWORDS=""
108 -IUSE="debug doc gold libedit +libffi ncurses test xar xml
109 +IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
110 kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
111 RESTRICT="!test? ( test )"
112
113 RDEPEND="
114 sys-libs/zlib:0=
115 + exegesis? ( dev-libs/libpfm:= )
116 gold? ( >=sys-devel/binutils-2.22:*[cxx] )
117 libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
118 libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
119 @@ -111,6 +112,7 @@ multilib_src_configure() {
120 -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
121 -DLLVM_ENABLE_LIBXML2=$(usex xml)
122 -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
123 + -DLLVM_ENABLE_LIBPFM=$(usex exegesis)
124 -DLLVM_ENABLE_EH=ON
125 -DLLVM_ENABLE_RTTI=ON
126
127
128 diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
129 index 196984744a5..014336a4f3e 100644
130 --- a/sys-devel/llvm/llvm-9999.ebuild
131 +++ b/sys-devel/llvm/llvm-9999.ebuild
132 @@ -37,12 +37,13 @@ LICENSE="UoI-NCSA rc BSD public-domain
133 llvm_targets_ARM? ( LLVM-Grant )"
134 SLOT="8"
135 KEYWORDS=""
136 -IUSE="debug doc gold libedit +libffi ncurses test xar xml
137 +IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
138 kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
139 RESTRICT="!test? ( test )"
140
141 RDEPEND="
142 sys-libs/zlib:0=
143 + exegesis? ( dev-libs/libpfm:= )
144 gold? ( >=sys-devel/binutils-2.22:*[cxx] )
145 libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
146 libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
147 @@ -139,6 +140,7 @@ multilib_src_configure() {
148 -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
149 -DLLVM_ENABLE_LIBXML2=$(usex xml)
150 -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
151 + -DLLVM_ENABLE_LIBPFM=$(usex exegesis)
152 -DLLVM_ENABLE_EH=ON
153 -DLLVM_ENABLE_RTTI=ON
154
155
156 diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
157 index e3546184271..4538466dde0 100644
158 --- a/sys-devel/llvm/metadata.xml
159 +++ b/sys-devel/llvm/metadata.xml
160 @@ -14,6 +14,8 @@
161 <flag name="default-compiler-rt">Use compiler-rt instead of libgcc as the default rtlib for clang</flag>
162 <flag name="default-libcxx">Use libc++ instead of libstdc++ as the default stdlib for clang</flag>
163 <flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag>
164 + <flag name="exegesis">Enable performance counter support for llvm-exegesis tool
165 + that can be used to measure host machine instruction characteristics</flag>
166 <flag name="gold">Build the gold linker plugin</flag>
167 <flag name="lldb">Build the lldb debugger</flag>
168 <flag name="multitarget">Build all host targets (default: host only)</flag>