commit: 0a7288fdaabc964b3aca7a348431d153cd11ad81
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 29 18:35:24 2021 +0000
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Thu Apr 29 18:35:24 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=0a7288fd
sys-devel/lld: sync with ::gentoo
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
sys-devel/lld/Manifest | 4 +-
.../{lld-10.0.1.ebuild => lld-10.0.1-r1.ebuild} | 16 ++------
.../{lld-11.0.0.ebuild => lld-11.1.0-r1.ebuild} | 24 +++++-------
.../lld/{lld-9.0.1.ebuild => lld-12.0.0.ebuild} | 44 ++++++++++++++--------
4 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 11ed9f9..716813f 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -1,3 +1,3 @@
DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B
30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1
SHA512
48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B
3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984
SHA512
b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B
b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f
SHA512
fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
+DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B
ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985
SHA512
9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
+DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B
f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe
SHA512
0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
diff --git a/sys-devel/lld/lld-10.0.1.ebuild
b/sys-devel/lld/lld-10.0.1-r1.ebuild
similarity index 78%
rename from sys-devel/lld/lld-10.0.1.ebuild
rename to sys-devel/lld/lld-10.0.1-r1.ebuild
index 7ce7ef0..89535c3 100644
--- a/sys-devel/lld/lld-10.0.1.ebuild
+++ b/sys-devel/lld/lld-10.0.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1
+inherit cmake llvm llvm.org python-any-r1
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/";
@@ -14,7 +14,7 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
@@ -34,8 +34,7 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
-
+ -DBUILD_SHARED_LIBS=ON
-DLLVM_INCLUDE_TESTS=$(usex test)
)
use test && mycmakeargs+=(
@@ -44,7 +43,6 @@ src_configure() {
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-DLLVM_LIT_ARGS="$(get_lit_flags)"
)
-
cmake_src_configure
}
@@ -52,9 +50,3 @@ src_test() {
local -x LIT_PRESERVES_TMP=1
cmake_build check-lld
}
-
-src_install() {
- cmake_src_install
- # LLD has no shared libraries, so strip it all for the time being
- rm -r "${ED}"/usr/{include,lib*} || die
-}
diff --git a/sys-devel/lld/lld-11.0.0.ebuild
b/sys-devel/lld/lld-11.1.0-r1.ebuild
similarity index 81%
rename from sys-devel/lld/lld-11.0.0.ebuild
rename to sys-devel/lld/lld-11.1.0-r1.ebuild
index 13dd968..b0133dc 100644
--- a/sys-devel/lld/lld-11.0.0.ebuild
+++ b/sys-devel/lld/lld-11.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,23 +8,25 @@ inherit cmake llvm llvm.org python-any-r1
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/";
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="~sys-devel/llvm-${PV}"
DEPEND="${RDEPEND}"
-BDEPEND="test? (
+BDEPEND="
+ test? (
>=dev-util/cmake-3.16
$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
)"
+LLVM_COMPONENTS=( lld )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
python_check_deps() {
has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
}
@@ -37,8 +39,7 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
- -DBUILD_SHARED_LIBS=OFF
-
+ -DBUILD_SHARED_LIBS=ON
-DLLVM_INCLUDE_TESTS=$(usex test)
)
use test && mycmakeargs+=(
@@ -48,7 +49,6 @@ src_configure() {
-DLLVM_LIT_ARGS="$(get_lit_flags)"
-DPython3_EXECUTABLE="${PYTHON}"
)
-
cmake_src_configure
}
@@ -56,9 +56,3 @@ src_test() {
local -x LIT_PRESERVES_TMP=1
cmake_build check-lld
}
-
-src_install() {
- cmake_src_install
- # LLD has no shared libraries, so strip it all for the time being
- rm -r "${ED}"/usr/{include,lib*} || die
-}
diff --git a/sys-devel/lld/lld-9.0.1.ebuild b/sys-devel/lld/lld-12.0.0.ebuild
similarity index 52%
rename from sys-devel/lld/lld-9.0.1.ebuild
rename to sys-devel/lld/lld-12.0.0.ebuild
index 88c17f9..c3f3d1a 100644
--- a/sys-devel/lld/lld-9.0.1.ebuild
+++ b/sys-devel/lld/lld-12.0.0.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_7 )
-inherit cmake-utils flag-o-matic llvm llvm.org multiprocessing python-any-r1
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake llvm llvm.org python-any-r1
DESCRIPTION="The LLVM linker (link editor)"
HOMEPAGE="https://llvm.org/";
-LLVM_COMPONENTS=( lld )
-LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
-llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="~sys-devel/llvm-${PV}"
DEPEND="${RDEPEND}"
-BDEPEND="test? ( $(python_gen_any_dep
"~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
+BDEPEND="
+ test? (
+ >=dev-util/cmake-3.16
+ $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+ )"
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
+LLVM_COMPONENTS=( lld libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
python_check_deps() {
has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
@@ -35,23 +37,33 @@ pkg_setup() {
use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
}
+src_unpack() {
+ llvm.org_src_unpack
+
+ # Directory ${WORKDIR}/llvm does not exist with USE="-test",
+ # but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+ # and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+ # (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+ # to existent directory ${WORKDIR}/libunwind/include.
+ mkdir -p "${WORKDIR}/llvm" || die
+}
+
src_configure() {
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
-
-DLLVM_INCLUDE_TESTS=$(usex test)
+ -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
)
use test && mycmakeargs+=(
-DLLVM_BUILD_TESTS=ON
- -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)"
+ -DPython3_EXECUTABLE="${PYTHON}"
)
-
- cmake-utils_src_configure
+ cmake_src_configure
}
src_test() {
local -x LIT_PRESERVES_TMP=1
- cmake-utils_src_make check-lld
+ cmake_build check-lld
}
