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