Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 12/18] dev-util/lldb: Dedupe with new eclass code
Date: Sat, 20 Jun 2020 21:21:02
Message-Id: 20200620211624.427466-13-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH 00/18] llvm.org.eclass: more deduplication with packages by "Michał Górny"
1 Signed-off-by: Michał Górny <mgorny@g.o>
2 ---
3 dev-util/lldb/lldb-10.0.1.9999.ebuild | 15 ++-------------
4 dev-util/lldb/lldb-10.0.1_rc1.ebuild | 15 ++-------------
5 dev-util/lldb/lldb-11.0.0.9999.ebuild | 15 ++-------------
6 3 files changed, 6 insertions(+), 39 deletions(-)
7
8 diff --git a/dev-util/lldb/lldb-10.0.1.9999.ebuild b/dev-util/lldb/lldb-10.0.1.9999.ebuild
9 index ecdb75359b11..2dfe01834ca3 100644
10 --- a/dev-util/lldb/lldb-10.0.1.9999.ebuild
11 +++ b/dev-util/lldb/lldb-10.0.1.9999.ebuild
12 @@ -4,8 +4,7 @@
13 EAPI=7
14
15 PYTHON_COMPAT=( python3_{6..9} )
16 -inherit cmake llvm llvm.org multiprocessing python-single-r1 \
17 - toolchain-funcs
18 +inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
19
20 DESCRIPTION="The LLVM debugger"
21 HOMEPAGE="https://llvm.org/"
22 @@ -43,21 +42,11 @@ BDEPEND="
23 sys-devel/lld )
24 ${PYTHON_DEPS}"
25
26 -# least intrusive of all
27 -CMAKE_BUILD_TYPE=RelWithDebInfo
28 -
29 pkg_setup() {
30 LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
31 python-single-r1_pkg_setup
32 }
33
34 -src_prepare() {
35 - # cmake eclasses suck by forcing ${S} here
36 - CMAKE_USE_DIR=${S} \
37 - S=${WORKDIR} \
38 - cmake_src_prepare
39 -}
40 -
41 src_configure() {
42 local mycmakeargs=(
43 -DLLDB_ENABLE_CURSES=$(usex ncurses)
44 @@ -87,7 +76,7 @@ src_configure() {
45
46 -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
47 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
48 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
49 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
50 )
51
52 cmake_src_configure
53 diff --git a/dev-util/lldb/lldb-10.0.1_rc1.ebuild b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
54 index ecdb75359b11..2dfe01834ca3 100644
55 --- a/dev-util/lldb/lldb-10.0.1_rc1.ebuild
56 +++ b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
57 @@ -4,8 +4,7 @@
58 EAPI=7
59
60 PYTHON_COMPAT=( python3_{6..9} )
61 -inherit cmake llvm llvm.org multiprocessing python-single-r1 \
62 - toolchain-funcs
63 +inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
64
65 DESCRIPTION="The LLVM debugger"
66 HOMEPAGE="https://llvm.org/"
67 @@ -43,21 +42,11 @@ BDEPEND="
68 sys-devel/lld )
69 ${PYTHON_DEPS}"
70
71 -# least intrusive of all
72 -CMAKE_BUILD_TYPE=RelWithDebInfo
73 -
74 pkg_setup() {
75 LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
76 python-single-r1_pkg_setup
77 }
78
79 -src_prepare() {
80 - # cmake eclasses suck by forcing ${S} here
81 - CMAKE_USE_DIR=${S} \
82 - S=${WORKDIR} \
83 - cmake_src_prepare
84 -}
85 -
86 src_configure() {
87 local mycmakeargs=(
88 -DLLDB_ENABLE_CURSES=$(usex ncurses)
89 @@ -87,7 +76,7 @@ src_configure() {
90
91 -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
92 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
93 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
94 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
95 )
96
97 cmake_src_configure
98 diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
99 index ecdb75359b11..2dfe01834ca3 100644
100 --- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
101 +++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
102 @@ -4,8 +4,7 @@
103 EAPI=7
104
105 PYTHON_COMPAT=( python3_{6..9} )
106 -inherit cmake llvm llvm.org multiprocessing python-single-r1 \
107 - toolchain-funcs
108 +inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
109
110 DESCRIPTION="The LLVM debugger"
111 HOMEPAGE="https://llvm.org/"
112 @@ -43,21 +42,11 @@ BDEPEND="
113 sys-devel/lld )
114 ${PYTHON_DEPS}"
115
116 -# least intrusive of all
117 -CMAKE_BUILD_TYPE=RelWithDebInfo
118 -
119 pkg_setup() {
120 LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
121 python-single-r1_pkg_setup
122 }
123
124 -src_prepare() {
125 - # cmake eclasses suck by forcing ${S} here
126 - CMAKE_USE_DIR=${S} \
127 - S=${WORKDIR} \
128 - cmake_src_prepare
129 -}
130 -
131 src_configure() {
132 local mycmakeargs=(
133 -DLLDB_ENABLE_CURSES=$(usex ncurses)
134 @@ -87,7 +76,7 @@ src_configure() {
135
136 -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
137 -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
138 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
139 + -DLLVM_LIT_ARGS="$(get_lit_flags)"
140 )
141
142 cmake_src_configure
143 --
144 2.27.0
Report Message
Find on MARC Find on Google Groups