Signed-off-by: Michał Górny <[email protected]>
---
dev-util/lldb/lldb-10.0.1.9999.ebuild | 15 ++-------------
dev-util/lldb/lldb-10.0.1_rc1.ebuild | 15 ++-------------
dev-util/lldb/lldb-11.0.0.9999.ebuild | 15 ++-------------
3 files changed, 6 insertions(+), 39 deletions(-)
diff --git a/dev-util/lldb/lldb-10.0.1.9999.ebuild
b/dev-util/lldb/lldb-10.0.1.9999.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.9999.ebuild
@@ -4,8 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
- toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/";
@@ -43,21 +42,11 @@ BDEPEND="
sys-devel/lld )
${PYTHON_DEPS}"
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
pkg_setup() {
LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
python-single-r1_pkg_setup
}
-src_prepare() {
- # cmake eclasses suck by forcing ${S} here
- CMAKE_USE_DIR=${S} \
- S=${WORKDIR} \
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs
"${MAKEOPTS}" "$(get_nproc)")}"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
)
cmake_src_configure
diff --git a/dev-util/lldb/lldb-10.0.1_rc1.ebuild
b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-10.0.1_rc1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
@@ -4,8 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
- toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/";
@@ -43,21 +42,11 @@ BDEPEND="
sys-devel/lld )
${PYTHON_DEPS}"
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
pkg_setup() {
LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
python-single-r1_pkg_setup
}
-src_prepare() {
- # cmake eclasses suck by forcing ${S} here
- CMAKE_USE_DIR=${S} \
- S=${WORKDIR} \
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs
"${MAKEOPTS}" "$(get_nproc)")}"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
)
cmake_src_configure
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild
b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index ecdb75359b11..2dfe01834ca3 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -4,8 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
- toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
DESCRIPTION="The LLVM debugger"
HOMEPAGE="https://llvm.org/";
@@ -43,21 +42,11 @@ BDEPEND="
sys-devel/lld )
${PYTHON_DEPS}"
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
pkg_setup() {
LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
python-single-r1_pkg_setup
}
-src_prepare() {
- # cmake eclasses suck by forcing ${S} here
- CMAKE_USE_DIR=${S} \
- S=${WORKDIR} \
- cmake_src_prepare
-}
-
src_configure() {
local mycmakeargs=(
-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs
"${MAKEOPTS}" "$(get_nproc)")}"
+ -DLLVM_LIT_ARGS="$(get_lit_flags)"
)
cmake_src_configure
--
2.27.0
