| 1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
| 2 |
--- |
| 3 |
sys-devel/clang/clang-10.0.1.9999.ebuild | 14 ++++---------- |
| 4 |
sys-devel/clang/clang-10.0.1_rc1.ebuild | 14 ++++---------- |
| 5 |
sys-devel/clang/clang-11.0.0.9999.ebuild | 14 ++++---------- |
| 6 |
3 files changed, 12 insertions(+), 30 deletions(-) |
| 7 |
|
| 8 |
diff --git a/sys-devel/clang/clang-10.0.1.9999.ebuild b/sys-devel/clang/clang-10.0.1.9999.ebuild |
| 9 |
index 8db3efe5b94a..2b8d5fee0580 100644 |
| 10 |
--- a/sys-devel/clang/clang-10.0.1.9999.ebuild |
| 11 |
+++ b/sys-devel/clang/clang-10.0.1.9999.ebuild |
| 12 |
@@ -4,8 +4,8 @@ |
| 13 |
EAPI=7 |
| 14 |
|
| 15 |
PYTHON_COMPAT=( python3_{6..9} ) |
| 16 |
-inherit cmake llvm llvm.org multilib-minimal multiprocessing \ |
| 17 |
- pax-utils python-single-r1 toolchain-funcs |
| 18 |
+inherit cmake llvm llvm.org multilib-minimal pax-utils \ |
| 19 |
+ python-single-r1 toolchain-funcs |
| 20 |
|
| 21 |
DESCRIPTION="C language family frontend for LLVM" |
| 22 |
HOMEPAGE="https://llvm.org/" |
| 23 |
@@ -55,9 +55,6 @@ PDEPEND=" |
| 24 |
default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) |
| 25 |
default-libcxx? ( >=sys-libs/libcxx-${PV} )" |
| 26 |
|
| 27 |
-# least intrusive of all |
| 28 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 29 |
- |
| 30 |
# Multilib notes: |
| 31 |
# 1. ABI_* flags control ABIs libclang* is built for only. |
| 32 |
# 2. clang is always capable of compiling code for all ABIs for enabled |
| 33 |
@@ -85,10 +82,7 @@ src_prepare() { |
| 34 |
mkdir -p x/y || die |
| 35 |
BUILD_DIR=${WORKDIR}/x/y/clang |
| 36 |
|
| 37 |
- # cmake eclasses suck by forcing ${S} here |
| 38 |
- CMAKE_USE_DIR=${S} \ |
| 39 |
- S=${WORKDIR} \ |
| 40 |
- cmake_src_prepare |
| 41 |
+ llvm.org_src_prepare |
| 42 |
|
| 43 |
mv ../clang-tools-extra tools/extra || die |
| 44 |
} |
| 45 |
@@ -259,7 +253,7 @@ multilib_src_configure() { |
| 46 |
) |
| 47 |
use test && mycmakeargs+=( |
| 48 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 49 |
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 50 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags)" |
| 51 |
) |
| 52 |
|
| 53 |
if multilib_is_native_abi; then |
| 54 |
diff --git a/sys-devel/clang/clang-10.0.1_rc1.ebuild b/sys-devel/clang/clang-10.0.1_rc1.ebuild |
| 55 |
index bc6d83f42a8d..db3798d217bd 100644 |
| 56 |
--- a/sys-devel/clang/clang-10.0.1_rc1.ebuild |
| 57 |
+++ b/sys-devel/clang/clang-10.0.1_rc1.ebuild |
| 58 |
@@ -4,8 +4,8 @@ |
| 59 |
EAPI=7 |
| 60 |
|
| 61 |
PYTHON_COMPAT=( python3_{6..9} ) |
| 62 |
-inherit cmake llvm llvm.org multilib-minimal multiprocessing \ |
| 63 |
- pax-utils python-single-r1 toolchain-funcs |
| 64 |
+inherit cmake llvm llvm.org multilib-minimal pax-utils \ |
| 65 |
+ python-single-r1 toolchain-funcs |
| 66 |
|
| 67 |
DESCRIPTION="C language family frontend for LLVM" |
| 68 |
HOMEPAGE="https://llvm.org/" |
| 69 |
@@ -55,9 +55,6 @@ PDEPEND=" |
| 70 |
default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) |
| 71 |
default-libcxx? ( >=sys-libs/libcxx-${PV} )" |
| 72 |
|
| 73 |
-# least intrusive of all |
| 74 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 75 |
- |
| 76 |
# Multilib notes: |
| 77 |
# 1. ABI_* flags control ABIs libclang* is built for only. |
| 78 |
# 2. clang is always capable of compiling code for all ABIs for enabled |
| 79 |
@@ -85,10 +82,7 @@ src_prepare() { |
| 80 |
mkdir -p x/y || die |
| 81 |
BUILD_DIR=${WORKDIR}/x/y/clang |
| 82 |
|
| 83 |
- # cmake eclasses suck by forcing ${S} here |
| 84 |
- CMAKE_USE_DIR=${S} \ |
| 85 |
- S=${WORKDIR} \ |
| 86 |
- cmake_src_prepare |
| 87 |
+ llvm.org_src_prepare |
| 88 |
|
| 89 |
mv ../clang-tools-extra tools/extra || die |
| 90 |
} |
| 91 |
@@ -259,7 +253,7 @@ multilib_src_configure() { |
| 92 |
) |
| 93 |
use test && mycmakeargs+=( |
| 94 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 95 |
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 96 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags)" |
| 97 |
) |
| 98 |
|
| 99 |
if multilib_is_native_abi; then |
| 100 |
diff --git a/sys-devel/clang/clang-11.0.0.9999.ebuild b/sys-devel/clang/clang-11.0.0.9999.ebuild |
| 101 |
index 76c40cb71042..5991c42d4c69 100644 |
| 102 |
--- a/sys-devel/clang/clang-11.0.0.9999.ebuild |
| 103 |
+++ b/sys-devel/clang/clang-11.0.0.9999.ebuild |
| 104 |
@@ -4,8 +4,8 @@ |
| 105 |
EAPI=7 |
| 106 |
|
| 107 |
PYTHON_COMPAT=( python3_{6..9} ) |
| 108 |
-inherit cmake llvm llvm.org multilib-minimal multiprocessing \ |
| 109 |
- pax-utils python-single-r1 toolchain-funcs |
| 110 |
+inherit cmake llvm llvm.org multilib-minimal pax-utils \ |
| 111 |
+ python-single-r1 toolchain-funcs |
| 112 |
|
| 113 |
DESCRIPTION="C language family frontend for LLVM" |
| 114 |
HOMEPAGE="https://llvm.org/" |
| 115 |
@@ -56,9 +56,6 @@ PDEPEND=" |
| 116 |
default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) |
| 117 |
default-libcxx? ( >=sys-libs/libcxx-${PV} )" |
| 118 |
|
| 119 |
-# least intrusive of all |
| 120 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 121 |
- |
| 122 |
# Multilib notes: |
| 123 |
# 1. ABI_* flags control ABIs libclang* is built for only. |
| 124 |
# 2. clang is always capable of compiling code for all ABIs for enabled |
| 125 |
@@ -80,10 +77,7 @@ src_prepare() { |
| 126 |
mkdir -p x/y || die |
| 127 |
BUILD_DIR=${WORKDIR}/x/y/clang |
| 128 |
|
| 129 |
- # cmake eclasses suck by forcing ${S} here |
| 130 |
- CMAKE_USE_DIR=${S} \ |
| 131 |
- S=${WORKDIR} \ |
| 132 |
- cmake_src_prepare |
| 133 |
+ llvm.org_src_prepare |
| 134 |
|
| 135 |
mv ../clang-tools-extra tools/extra || die |
| 136 |
} |
| 137 |
@@ -254,7 +248,7 @@ multilib_src_configure() { |
| 138 |
) |
| 139 |
use test && mycmakeargs+=( |
| 140 |
-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 141 |
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 142 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags)" |
| 143 |
) |
| 144 |
|
| 145 |
if multilib_is_native_abi; then |
| 146 |
-- |
| 147 |
2.27.0 |
Archives