| 1 |
Signed-off-by: Michał Górny <mgorny@g.o> |
| 2 |
--- |
| 3 |
sys-devel/lld/lld-10.0.0.9999.ebuild | 17 +++++------------ |
| 4 |
sys-devel/lld/lld-9.0.0.ebuild | 23 ++++------------------- |
| 5 |
sys-devel/lld/lld-9.0.1.9999.ebuild | 18 +++++------------- |
| 6 |
3 files changed, 14 insertions(+), 44 deletions(-) |
| 7 |
|
| 8 |
diff --git a/sys-devel/lld/lld-10.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.0.9999.ebuild |
| 9 |
index c0a2e884c80d..0938eee4baad 100644 |
| 10 |
--- a/sys-devel/lld/lld-10.0.0.9999.ebuild |
| 11 |
+++ b/sys-devel/lld/lld-10.0.0.9999.ebuild |
| 12 |
@@ -8,13 +8,13 @@ EAPI=7 |
| 13 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 14 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 15 |
|
| 16 |
-inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 |
| 17 |
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 |
| 18 |
|
| 19 |
DESCRIPTION="The LLVM linker (link editor)" |
| 20 |
HOMEPAGE="https://llvm.org/" |
| 21 |
-SRC_URI="" |
| 22 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
| 23 |
-S=${WORKDIR}/${P}/lld |
| 24 |
+LLVM_COMPONENTS=( lld ) |
| 25 |
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) |
| 26 |
+llvm.org_set_globals |
| 27 |
|
| 28 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
| 29 |
SLOT="0" |
| 30 |
@@ -38,13 +38,6 @@ pkg_setup() { |
| 31 |
use test && python-any-r1_pkg_setup |
| 32 |
} |
| 33 |
|
| 34 |
-src_unpack() { |
| 35 |
- local dirs=( lld ) |
| 36 |
- use test && dirs+=( llvm/utils/{lit,unittest} ) |
| 37 |
- git-r3_fetch |
| 38 |
- git-r3_checkout '' '' '' "${dirs[@]}" |
| 39 |
-} |
| 40 |
- |
| 41 |
src_configure() { |
| 42 |
local mycmakeargs=( |
| 43 |
-DBUILD_SHARED_LIBS=OFF |
| 44 |
@@ -53,7 +46,7 @@ src_configure() { |
| 45 |
) |
| 46 |
use test && mycmakeargs+=( |
| 47 |
-DLLVM_BUILD_TESTS=ON |
| 48 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" |
| 49 |
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 50 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 51 |
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 52 |
) |
| 53 |
diff --git a/sys-devel/lld/lld-9.0.0.ebuild b/sys-devel/lld/lld-9.0.0.ebuild |
| 54 |
index c938e81bb902..f411d28781d4 100644 |
| 55 |
--- a/sys-devel/lld/lld-9.0.0.ebuild |
| 56 |
+++ b/sys-devel/lld/lld-9.0.0.ebuild |
| 57 |
@@ -8,16 +8,13 @@ EAPI=7 |
| 58 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 59 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 60 |
|
| 61 |
-inherit cmake-utils llvm multiprocessing python-any-r1 |
| 62 |
- |
| 63 |
-MY_P=${P/_/}.src |
| 64 |
-LLVM_P=llvm-${PV/_/}.src |
| 65 |
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 |
| 66 |
|
| 67 |
DESCRIPTION="The LLVM linker (link editor)" |
| 68 |
HOMEPAGE="https://llvm.org/" |
| 69 |
-SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz |
| 70 |
- test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz )" |
| 71 |
-S=${WORKDIR}/${MY_P} |
| 72 |
+LLVM_COMPONENTS=( lld ) |
| 73 |
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) |
| 74 |
+llvm.org_set_globals |
| 75 |
|
| 76 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
| 77 |
SLOT="0" |
| 78 |
@@ -41,18 +38,6 @@ pkg_setup() { |
| 79 |
use test && python-any-r1_pkg_setup |
| 80 |
} |
| 81 |
|
| 82 |
-src_unpack() { |
| 83 |
- einfo "Unpacking ${MY_P}.tar.xz ..." |
| 84 |
- tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die |
| 85 |
- |
| 86 |
- if use test; then |
| 87 |
- einfo "Unpacking parts of ${LLVM_P}.tar.xz ..." |
| 88 |
- tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \ |
| 89 |
- "${LLVM_P}"/utils/{lit,unittest} || die |
| 90 |
- mv "${LLVM_P}" llvm || die |
| 91 |
- fi |
| 92 |
-} |
| 93 |
- |
| 94 |
src_configure() { |
| 95 |
local mycmakeargs=( |
| 96 |
-DBUILD_SHARED_LIBS=ON |
| 97 |
diff --git a/sys-devel/lld/lld-9.0.1.9999.ebuild b/sys-devel/lld/lld-9.0.1.9999.ebuild |
| 98 |
index 07ffc6f41c97..60ae216d4d6b 100644 |
| 99 |
--- a/sys-devel/lld/lld-9.0.1.9999.ebuild |
| 100 |
+++ b/sys-devel/lld/lld-9.0.1.9999.ebuild |
| 101 |
@@ -8,14 +8,13 @@ EAPI=7 |
| 102 |
CMAKE_MIN_VERSION=3.7.0-r1 |
| 103 |
PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 104 |
|
| 105 |
-inherit cmake-utils git-r3 llvm multiprocessing python-any-r1 |
| 106 |
+inherit cmake-utils llvm llvm.org multiprocessing python-any-r1 |
| 107 |
|
| 108 |
DESCRIPTION="The LLVM linker (link editor)" |
| 109 |
HOMEPAGE="https://llvm.org/" |
| 110 |
-SRC_URI="" |
| 111 |
-EGIT_REPO_URI="https://github.com/llvm/llvm-project.git" |
| 112 |
-EGIT_BRANCH="release/9.x" |
| 113 |
-S=${WORKDIR}/${P}/lld |
| 114 |
+LLVM_COMPONENTS=( lld ) |
| 115 |
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) |
| 116 |
+llvm.org_set_globals |
| 117 |
|
| 118 |
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" |
| 119 |
SLOT="0" |
| 120 |
@@ -39,13 +38,6 @@ pkg_setup() { |
| 121 |
use test && python-any-r1_pkg_setup |
| 122 |
} |
| 123 |
|
| 124 |
-src_unpack() { |
| 125 |
- local dirs=( lld ) |
| 126 |
- use test && dirs+=( llvm/utils/{lit,unittest} ) |
| 127 |
- git-r3_fetch |
| 128 |
- git-r3_checkout '' '' '' "${dirs[@]}" |
| 129 |
-} |
| 130 |
- |
| 131 |
src_configure() { |
| 132 |
local mycmakeargs=( |
| 133 |
-DBUILD_SHARED_LIBS=ON |
| 134 |
@@ -54,7 +46,7 @@ src_configure() { |
| 135 |
) |
| 136 |
use test && mycmakeargs+=( |
| 137 |
-DLLVM_BUILD_TESTS=ON |
| 138 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/${P}/llvm" |
| 139 |
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
| 140 |
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 141 |
-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" |
| 142 |
) |
| 143 |
-- |
| 144 |
2.23.0 |
Archives