commit: 7a27a08fb930e50c6f23bac1c951a0ca90051043 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> AuthorDate: Mon Feb 22 15:38:08 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Mar 4 17:42:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a27a08f
sys-devel/lld: enable shared libraries on lld Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...lld-13.0.0.9999.ebuild => lld-10.0.1-r1.ebuild} | 39 ++++------------------ ...lld-13.0.0.9999.ebuild => lld-11.0.0-r1.ebuild} | 35 ++++--------------- ...lld-13.0.0.9999.ebuild => lld-11.0.1-r1.ebuild} | 27 +++------------ ...lld-13.0.0.9999.ebuild => lld-11.1.0-r1.ebuild} | 27 +++------------ sys-devel/lld/lld-12.0.0.9999.ebuild | 12 ++----- sys-devel/lld/lld-13.0.0.9999.ebuild | 10 +----- 6 files changed, 25 insertions(+), 125 deletions(-) diff --git a/sys-devel/lld/lld-13.0.0.9999.ebuild b/sys-devel/lld/lld-10.0.1-r1.ebuild similarity index 56% copy from sys-devel/lld/lld-13.0.0.9999.ebuild copy to sys-devel/lld/lld-10.0.1-r1.ebuild index 130638f2e5a..3eb4d030dbb 100644 --- a/sys-devel/lld/lld-13.0.0.9999.ebuild +++ b/sys-devel/lld/lld-10.0.1-r1.ebuild @@ -8,24 +8,19 @@ 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="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND="~sys-devel/llvm-${PV}" DEPEND="${RDEPEND}" -BDEPEND=" - test? ( - >=dev-util/cmake-3.16 - $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") - )" - -LLVM_COMPONENTS=( lld libunwind/include/mach-o ) -LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) -llvm.org_set_globals +BDEPEND="test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" python_check_deps() { has_version -b "dev-python/lit[${PYTHON_USEDEP}]" @@ -36,31 +31,17 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -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=OFF - + -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="$(get_lit_flags)" - -DPython3_EXECUTABLE="${PYTHON}" ) - cmake_src_configure } @@ -68,9 +49,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-13.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.0-r1.ebuild similarity index 63% copy from sys-devel/lld/lld-13.0.0.9999.ebuild copy to sys-devel/lld/lld-11.0.0-r1.ebuild index 130638f2e5a..ccb34a35f4b 100644 --- a/sys-devel/lld/lld-13.0.0.9999.ebuild +++ b/sys-devel/lld/lld-11.0.0-r1.ebuild @@ -8,25 +8,23 @@ 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="" +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 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}]" } @@ -36,31 +34,18 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -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=OFF - + -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="$(get_lit_flags)" -DPython3_EXECUTABLE="${PYTHON}" ) - cmake_src_configure } @@ -68,9 +53,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-13.0.0.9999.ebuild b/sys-devel/lld/lld-11.0.1-r1.ebuild similarity index 65% copy from sys-devel/lld/lld-13.0.0.9999.ebuild copy to sys-devel/lld/lld-11.0.1-r1.ebuild index 130638f2e5a..443ff658f0d 100644 --- a/sys-devel/lld/lld-13.0.0.9999.ebuild +++ b/sys-devel/lld/lld-11.0.1-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"; LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -23,7 +23,7 @@ BDEPEND=" $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" -LLVM_COMPONENTS=( lld libunwind/include/mach-o ) +LLVM_COMPONENTS=( lld ) LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) llvm.org_set_globals @@ -36,31 +36,18 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -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=OFF - + -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="$(get_lit_flags)" -DPython3_EXECUTABLE="${PYTHON}" ) - cmake_src_configure } @@ -68,9 +55,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-13.0.0.9999.ebuild b/sys-devel/lld/lld-11.1.0-r1.ebuild similarity index 65% copy from sys-devel/lld/lld-13.0.0.9999.ebuild copy to sys-devel/lld/lld-11.1.0-r1.ebuild index 130638f2e5a..443ff658f0d 100644 --- a/sys-devel/lld/lld-13.0.0.9999.ebuild +++ b/sys-devel/lld/lld-11.1.0-r1.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"; LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" IUSE="test" RESTRICT="!test? ( test )" @@ -23,7 +23,7 @@ BDEPEND=" $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )" -LLVM_COMPONENTS=( lld libunwind/include/mach-o ) +LLVM_COMPONENTS=( lld ) LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} ) llvm.org_set_globals @@ -36,31 +36,18 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -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=OFF - + -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="$(get_lit_flags)" -DPython3_EXECUTABLE="${PYTHON}" ) - cmake_src_configure } @@ -68,9 +55,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-12.0.0.9999.ebuild b/sys-devel/lld/lld-12.0.0.9999.ebuild index 0f5405e8929..da442603c87 100644 --- a/sys-devel/lld/lld-12.0.0.9999.ebuild +++ b/sys-devel/lld/lld-12.0.0.9999.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 @@ -49,8 +49,7 @@ src_unpack() { src_configure() { local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - + -DBUILD_SHARED_LIBS=ON -DLLVM_INCLUDE_TESTS=$(usex test) -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" ) @@ -60,7 +59,6 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" -DPython3_EXECUTABLE="${PYTHON}" ) - cmake_src_configure } @@ -68,9 +66,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-13.0.0.9999.ebuild b/sys-devel/lld/lld-13.0.0.9999.ebuild index 130638f2e5a..da442603c87 100644 --- a/sys-devel/lld/lld-13.0.0.9999.ebuild +++ b/sys-devel/lld/lld-13.0.0.9999.ebuild @@ -49,8 +49,7 @@ src_unpack() { src_configure() { local mycmakeargs=( - -DBUILD_SHARED_LIBS=OFF - + -DBUILD_SHARED_LIBS=ON -DLLVM_INCLUDE_TESTS=$(usex test) -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" ) @@ -60,7 +59,6 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" -DPython3_EXECUTABLE="${PYTHON}" ) - cmake_src_configure } @@ -68,9 +66,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 -}
