commit: 917b6c0905b527aaf74e680c0cd1ca421ab30d95 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Sep 21 08:32:54 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 21 09:15:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917b6c09
sys-devel/clang: Reorder ebuild vars in 9+ Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-devel/clang/clang-10.0.0.9999.ebuild | 11 +++++------ sys-devel/clang/clang-9.0.0.9999.ebuild | 11 +++++------ sys-devel/clang/clang-9.0.0.ebuild | 10 ++++------ 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/sys-devel/clang/clang-10.0.0.9999.ebuild b/sys-devel/clang/clang-10.0.0.9999.ebuild index 54f0479ac53..88157e2c886 100644 --- a/sys-devel/clang/clang-10.0.0.9999.ebuild +++ b/sys-devel/clang/clang-10.0.0.9999.ebuild @@ -14,6 +14,9 @@ inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \ DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/"; SRC_URI="" +# We need extra level of indirection for CLANG_RESOURCE_DIR +S=${WORKDIR}/x/y/${P} + EGIT_REPO_URI="https://git.llvm.org/git/clang.git https://github.com/llvm-mirror/clang.git"; @@ -33,6 +36,8 @@ SLOT="$(ver_cut 1)" KEYWORDS="" IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" RDEPEND=" @@ -56,12 +61,6 @@ PDEPEND=" default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) default-libcxx? ( >=sys-libs/libcxx-${PV} )" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( ${ALL_LLVM_TARGETS[*]} )" - -# We need extra level of indirection for CLANG_RESOURCE_DIR -S=${WORKDIR}/x/y/${P} - # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/sys-devel/clang/clang-9.0.0.9999.ebuild b/sys-devel/clang/clang-9.0.0.9999.ebuild index 16f86d8d2b9..848de712e24 100644 --- a/sys-devel/clang/clang-9.0.0.9999.ebuild +++ b/sys-devel/clang/clang-9.0.0.9999.ebuild @@ -14,6 +14,9 @@ inherit cmake-utils git-r3 llvm multilib-minimal multiprocessing \ DESCRIPTION="C language family frontend for LLVM" HOMEPAGE="https://llvm.org/"; SRC_URI="" +# We need extra level of indirection for CLANG_RESOURCE_DIR +S=${WORKDIR}/x/y/${P} + EGIT_REPO_URI="https://git.llvm.org/git/clang.git https://github.com/llvm-mirror/clang.git"; EGIT_BRANCH="release_90" @@ -32,6 +35,8 @@ SLOT="$(ver_cut 1)" KEYWORDS="" IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" RDEPEND=" @@ -55,12 +60,6 @@ PDEPEND=" default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) default-libcxx? ( >=sys-libs/libcxx-${PV} )" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( ${ALL_LLVM_TARGETS[*]} )" - -# We need extra level of indirection for CLANG_RESOURCE_DIR -S=${WORKDIR}/x/y/${P} - # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/sys-devel/clang/clang-9.0.0.ebuild b/sys-devel/clang/clang-9.0.0.ebuild index e72ceac433b..4a4b325876a 100644 --- a/sys-devel/clang/clang-9.0.0.ebuild +++ b/sys-devel/clang/clang-9.0.0.ebuild @@ -21,6 +21,8 @@ SRC_URI="https://releases.llvm.org/${PV}/${MY_P}.tar.xz https://releases.llvm.org/${PV}/${EXTRA_P}.tar.xz test? ( https://releases.llvm.org/${PV}/${LLVM_P}.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )" +# We need extra level of indirection for CLANG_RESOURCE_DIR +S=${WORKDIR}/x/y/${MY_P} # Keep in sync with sys-devel/llvm ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 @@ -36,6 +38,8 @@ SLOT="$(ver_cut 1)" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux" IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( ${ALL_LLVM_TARGETS[*]} )" RESTRICT="!test? ( test )" RDEPEND=" @@ -59,12 +63,6 @@ PDEPEND=" default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* ) default-libcxx? ( >=sys-libs/libcxx-${PV} )" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( ${ALL_LLVM_TARGETS[*]} )" - -# We need extra level of indirection for CLANG_RESOURCE_DIR -S=${WORKDIR}/x/y/${MY_P} - # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo
