diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2022-10-02 09:42:38 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2022-10-03 14:36:32 +0200 |
| commit | 0491ed213ff1a1cc843ec31f28ade36e0913fdb6 (patch) | |
| tree | cde5e56078402548ac861b9d21a1a02da5f7cacb /sys-devel/clang | |
| parent | sys-devel/clang-common: Backport config support to 15.0.2.9999 (diff) | |
| download | gentoo-0491ed213ff1a1cc843ec31f28ade36e0913fdb6.tar.gz gentoo-0491ed213ff1a1cc843ec31f28ade36e0913fdb6.tar.bz2 gentoo-0491ed213ff1a1cc843ec31f28ade36e0913fdb6.zip | |
sys-devel/clang: Backport config support to 15.0.2.9999
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-devel/clang')
| -rw-r--r-- | sys-devel/clang/Manifest | 2 | ||||
| -rw-r--r-- | sys-devel/clang/clang-15.0.2.9999.ebuild | 21 |
2 files changed, 5 insertions, 18 deletions
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index ef86825a19a1..f714a5d4c332 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -3,8 +3,8 @@ DIST llvm-14.0.6-manpages.tar.bz2 218186 BLAKE2B 4491296e490936a2d7b518e19a0ff63 DIST llvm-15.0.1-manpages.tar.bz2 228787 BLAKE2B 7a43d98cf8546457b6c8557d47c5439900b584111e314c9a38671d20f12244314c56af6a8e7427345eea7e48a9b0d51aff88b2f7ae97be5f7122c068d92a9f3e SHA512 f08620768f632b85d1ad624c1dd6f93743069113411603583fa3b540072b05a44123e8149ed2a36340ca3973e99f84291281bc8ddd0fca159a4a5509fbadd3d7 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01 DIST llvm-gentoo-patchset-14.0.6-r2.tar.xz 16120 BLAKE2B e12e522fdb7ba505693c679cb09cc8e00e6a954df195c86c2af4dbf1b68334a405b8dcc45f2e28b5e5e0b7e9d5eb7ba907337027927371b7a3b7784ff8aae7e0 SHA512 8a5ea71c30fc0727cc855dd812bbcb6d5f51c80c98eb3d5b80258d5c5eaab1310edc9d53ae63c2ca827abec68e2912c4b69ef0da351ff883fb30545a61e1d09c +DIST llvm-gentoo-patchset-15.0.1-r104.tar.xz 15608 BLAKE2B f34d9e1c5f9df74c09b25970843592df46ed10e85f8e07e37145c1ba1938481f8a68edbac0668b1259b4566508f5bf21991a5c49764d28c7c5eaaa86ece9189e SHA512 4d3f1855f513db8262240bcb95f350e0af0847e76189cd507e3bce5cd7d37d840d97fb6a4e6e9ad5ca15dfe8f7d91d7463391470ce546d46efe4010c60b5d2e1 DIST llvm-gentoo-patchset-15.0.1.tar.xz 3516 BLAKE2B 1bc54df5272eb743b5f736cca2bd5a90cf371ee759ba3aa787910ce6cc58c5c61c3eae226a0619aa9c4e9b8639149d53582cf52fad4014e65a83f52eaeaf5b61 SHA512 380ed5ffdeacf97bf76d49bec90f8f46c53f50fdd46983ab77afda4aaa6bdc671c0e179fe9dca1d8e50e377080675575f72ca2b05582349f8710e1b3c2dc76a6 -DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a DIST llvm-gentoo-patchset-9999-r4.tar.xz 4120 BLAKE2B 0d45763a36b711e336bf1e36c361c68df5d679837e0b1cb1f9cc26bb52bf769f3c6683f56a01a7ea2bddcbf044a883ea504360a2414ad8dab1f696b8bdd61bfa SHA512 a02b08faf2fa59302161e7ac8f129592fde2e6c6ad5b273c948fa0d68e6a76f14fecc2850cec43f9a9505d483066240eaa3787c77e6bf75bbaa2c4dcacda2d16 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6 diff --git a/sys-devel/clang/clang-15.0.2.9999.ebuild b/sys-devel/clang/clang-15.0.2.9999.ebuild index ca2b0df55f46..63ceb8981120 100644 --- a/sys-devel/clang/clang-15.0.2.9999.ebuild +++ b/sys-devel/clang/clang-15.0.2.9999.ebuild @@ -16,10 +16,7 @@ HOMEPAGE="https://llvm.org/" LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" SLOT="$(ver_cut 1)" KEYWORDS="" -IUSE=" - debug default-compiler-rt default-libcxx default-lld doc - llvm-libunwind +pie +static-analyzer test xml -" +IUSE="debug doc +pie +static-analyzer test xml" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" @@ -32,6 +29,7 @@ DEPEND=" RDEPEND=" ${PYTHON_DEPS} ${DEPEND} + >=sys-devel/clang-common-${PV} " BDEPEND=" ${PYTHON_DEPS} @@ -46,13 +44,6 @@ PDEPEND=" sys-devel/clang-common sys-devel/clang-toolchain-symlinks:${SLOT} ~sys-devel/clang-runtime-${PV} - default-compiler-rt? ( - =sys-libs/compiler-rt-${PV%_*}* - llvm-libunwind? ( sys-libs/llvm-libunwind ) - !llvm-libunwind? ( sys-libs/libunwind ) - ) - default-libcxx? ( >=sys-libs/libcxx-${PV} ) - default-lld? ( sys-devel/lld ) " LLVM_COMPONENTS=( @@ -65,7 +56,7 @@ LLVM_TEST_COMPONENTS=( llvm/utils/{lit,llvm-lit,unittest} llvm/utils/{UpdateTestChecks,update_cc_test_checks.py} ) -LLVM_PATCHSET=9999-r3 +LLVM_PATCHSET=15.0.1-r104 LLVM_USE_TARGETS=llvm llvm.org_set_globals @@ -261,6 +252,7 @@ multilib_src_configure() { -DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm" -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}" -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man" + -DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang" # relative to bindir -DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}" @@ -283,12 +275,7 @@ multilib_src_configure() { # disable using CUDA to autodetect GPU, just build for all -DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON - # override default stdlib and rtlib - -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "") - -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "") - -DCLANG_DEFAULT_LINKER=$(usex default-lld lld "") -DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie) - -DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "") -DCLANG_ENABLE_ARCMT=$(usex static-analyzer) -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer) |