commit:     ab3f33e935394a051fc056db567566784741b0c1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  4 15:07:40 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan  4 15:27:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab3f33e9

llvm-core/clang-common: Add 20.0.0_pre20250104 snapshot

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 llvm-core/clang-common/Manifest                    |   1 +
 .../clang-common-20.0.0_pre20250104.ebuild         | 310 +++++++++++++++++++++
 2 files changed, 311 insertions(+)

diff --git a/llvm-core/clang-common/Manifest b/llvm-core/clang-common/Manifest
index fef409fa0e6a..e960d60a57bd 100644
--- a/llvm-core/clang-common/Manifest
+++ b/llvm-core/clang-common/Manifest
@@ -10,4 +10,5 @@ DIST llvm-project-19.1.4.src.tar.xz 141255156 BLAKE2B 
b99cd8a96e38dbcfb582ee5d22
 DIST llvm-project-19.1.4.src.tar.xz.sig 438 BLAKE2B 
b0925bdb761046d69779e0b035e29430bc09ef2b81be763aa5c853793631d7b7fdd65eb4dae7a1e3b4daa15d189c24cd1e14f065f79fdbf75429fa34be9b330e
 SHA512 
3fb4a6c7594cb43680860698dac47062dde30de60f515dcecdad63812ea1edfb2cb209d0a7ac2254589c245a95b7c0f571b582e0d4b97a6ae8242563483ea764
 DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B 
b35ab0c754f28c850ac6fd4ee584e963b1d5cf06885c59827ee4ac11f93cde5b8e0268fbed560839137de2c495c9da2b889331cd12a8a02958d8e0cbdbed2607
 SHA512 
d411a6d913d6a1e1f3c16cfc1ce81c1e6292ea370703f55fb67c7af62f02193d53f5ef7823c8679d6f25cbe47b40236fcaf37044ad7cdfada8166efe7eb106b3
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 
1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b
 SHA512 
8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
+DIST llvm-project-2529a8df53af9bc6cecfd6c83404ffa5e89e3370.tar.gz 224493461 
BLAKE2B 
0d3c757a8f34a9bf6b2ac0ad394cc1f8125cfee534c8bd0c5875eba56fe0171892586ec05b6f1e859e5962f81c76c9a315f60bcda012df73a3bd66709b265038
 SHA512 
a49fa1da2fd398b279a90292704e30d8ff7163219bfd91c4a80fa5123d957cdef52d2ee41710a8bcbfea3d9a5eec269dfc756584fcc27a495f7f381176de4e69
 DIST llvm-project-ccfe0de0e1e37ed369c9bf89dd0188ba0afb2e9a.tar.gz 224396427 
BLAKE2B 
6e13c65d2ba83fdaf2db20a58b878106568406f07f9c2ceb47e4d2572fb041211384ed67c43801764060101ec4a1b04c18bf4097f37512d2751aa5860c1a8dc3
 SHA512 
ef4512b735568aaa627a7f4e9bac3fc4722db7a2b8bd1610faaf066856be9474fb297fd75b3c0dcc76f60ab35c3110fd329faad3e8d9b75e93844d56f41c03d1

diff --git a/llvm-core/clang-common/clang-common-20.0.0_pre20250104.ebuild 
b/llvm-core/clang-common/clang-common-20.0.0_pre20250104.ebuild
new file mode 100644
index 000000000000..1fde60b6b6de
--- /dev/null
+++ b/llvm-core/clang-common/clang-common-20.0.0_pre20250104.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org multilib
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/";
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+IUSE="
+       default-compiler-rt default-libcxx default-lld
+       bootstrap-prefix cet hardened llvm-libunwind
+"
+
+PDEPEND="
+       default-compiler-rt? (
+               llvm-core/clang-runtime:${LLVM_MAJOR}[compiler-rt]
+               llvm-libunwind? ( llvm-runtimes/libunwind[static-libs] )
+               !llvm-libunwind? ( sys-libs/libunwind[static-libs] )
+       )
+       !default-compiler-rt? ( sys-devel/gcc )
+       default-libcxx? ( >=llvm-runtimes/libcxx-${PV}[static-libs] )
+       !default-libcxx? ( sys-devel/gcc )
+       default-lld? ( >=llvm-core/lld-${PV} )
+       !default-lld? ( sys-devel/binutils )
+"
+IDEPEND="
+       !default-compiler-rt? ( sys-devel/gcc-config )
+       !default-libcxx? ( sys-devel/gcc-config )
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+pkg_pretend() {
+       [[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
+
+       local flag missing_flags=()
+       for flag in default-{compiler-rt,libcxx,lld}; do
+               if ! use "${flag}" && has_version "llvm-core/clang[${flag}]"; 
then
+                       missing_flags+=( "${flag}" )
+               fi
+       done
+
+       if [[ ${missing_flags[@]} ]]; then
+               eerror "It seems that you have the following flags set on 
llvm-core/clang:"
+               eerror
+               eerror "  ${missing_flags[*]}"
+               eerror
+               eerror "The default runtimes are now set via flags on 
llvm-core/clang-common."
+               eerror "The build is being aborted to prevent breakage.  Please 
either set"
+               eerror "the respective flags on this ebuild, e.g.:"
+               eerror
+               eerror "  llvm-core/clang-common ${missing_flags[*]}"
+               eerror
+               eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
+               die "Mismatched defaults detected between llvm-core/clang and 
llvm-core/clang-common"
+       fi
+}
+
+_doclang_cfg() {
+       local triple="${1}"
+
+       local tool
+       for tool in ${triple}-clang{,++}; do
+               newins - "${tool}.cfg" <<-EOF
+                       # This configuration file is used by ${tool} driver.
+                       @gentoo-common.cfg
+                       @gentoo-common-ld.cfg
+               EOF
+               if [[ ${triple} == x86_64* ]]; then
+                       cat >> "${ED}/etc/clang/${tool}.cfg" <<-EOF || die
+                               @gentoo-cet.cfg
+                       EOF
+               fi
+       done
+
+       if use kernel_Darwin; then
+               cat >> "${ED}/etc/clang/${triple}-clang++.cfg" <<-EOF || die
+                       -lc++abi
+               EOF
+       fi
+
+       newins - "${triple}-clang-cpp.cfg" <<-EOF
+               # This configuration file is used by the ${triple}-clang-cpp 
driver.
+               @gentoo-common.cfg
+       EOF
+       if [[ ${triple} == x86_64* ]]; then
+               cat >> "${ED}/etc/clang/${triple}-clang-cpp.cfg" <<-EOF || die
+                       @gentoo-cet.cfg
+               EOF
+       fi
+
+       # Install symlinks for triples with other vendor strings since some
+       # programs insist on mangling the triple.
+       local vendor
+       for vendor in gentoo pc unknown; do
+               local vendor_triple="${triple%%-*}-${vendor}-${triple#*-*-}"
+               for tool in clang{,++,-cpp}; do
+                       if [[ ! -f 
"${ED}/etc/clang/${vendor_triple}-${tool}.cfg" ]]; then
+                               dosym "${triple}-${tool}.cfg" 
"/etc/clang/${vendor_triple}-${tool}.cfg"
+                       fi
+               done
+       done
+}
+
+doclang_cfg() {
+       local triple="${1}"
+
+       _doclang_cfg ${triple}
+
+       # LLVM may have different arch names in some cases. For example in x86
+       # profiles the triple uses i686, but llvm will prefer i386 if invoked
+       # with "clang" on x86 or "clang -m32" on x86_64. The gentoo triple will
+       # be used if invoked through ${CHOST}-clang{,++,-cpp} though.
+       #
+       # To make sure the correct triples are installed,
+       # see Triple::getArchTypeName() in llvm/lib/TargetParser/Triple.cpp
+       # and compare with CHOST values in profiles.
+
+       local abi=${triple%%-*}
+       case ${abi} in
+               armv4l|armv4t|armv5tel|armv6j|armv7a)
+                       _doclang_cfg ${triple/${abi}/arm}
+                       ;;
+               i686)
+                       _doclang_cfg ${triple/${abi}/i386}
+                       ;;
+               sparc)
+                       _doclang_cfg ${triple/${abi}/sparcel}
+                       ;;
+               sparc64)
+                       _doclang_cfg ${triple/${abi}/sparcv9}
+                       ;;
+       esac
+}
+
+src_install() {
+       newbashcomp bash-autocomplete.sh clang
+
+       insinto /etc/clang
+       newins - gentoo-runtimes.cfg <<-EOF
+               # This file is initially generated by llvm-core/clang-runtime.
+               # It is used to control the default runtimes using by clang.
+
+               --rtlib=$(usex default-compiler-rt compiler-rt libgcc)
+               --unwindlib=$(usex default-compiler-rt libunwind libgcc)
+               --stdlib=$(usex default-libcxx libc++ libstdc++)
+               -fuse-ld=$(usex default-lld lld bfd)
+       EOF
+
+       newins - gentoo-gcc-install.cfg <<-EOF
+               # This file is maintained by gcc-config.
+               # It is used to specify the selected GCC installation.
+       EOF
+
+       newins - gentoo-common.cfg <<-EOF
+               # This file contains flags common to clang, clang++ and 
clang-cpp.
+               @gentoo-runtimes.cfg
+               @gentoo-gcc-install.cfg
+               @gentoo-hardened.cfg
+               # bug #870001
+               -include "${EPREFIX}/usr/include/gentoo/maybe-stddefs.h"
+       EOF
+
+       # clang-cpp does not like link args being passed to it when directly
+       # invoked, so use a separate configuration file.
+       newins - gentoo-common-ld.cfg <<-EOF
+               # This file contains flags common to clang and clang++
+               @gentoo-hardened-ld.cfg
+       EOF
+
+       # Baseline hardening (bug #851111)
+       newins - gentoo-hardened.cfg <<-EOF
+               # Some of these options are added unconditionally, regardless of
+               # USE=hardened, for parity with sys-devel/gcc.
+               -Xarch_host -fstack-clash-protection
+               -Xarch_host -fstack-protector-strong
+               -fPIE
+               -include "${EPREFIX}/usr/include/gentoo/fortify.h"
+       EOF
+
+       newins - gentoo-cet.cfg <<-EOF
+               -Xarch_host -fcf-protection=$(usex cet full none)
+       EOF
+
+       if use kernel_Darwin; then
+               newins - gentoo-hardened-ld.cfg <<-EOF
+                       # There was -Wl,-z,relro here, but it's not supported 
on Mac
+                       # TODO: investigate whether -bind_at_load or 
-read_only_stubs will do the job
+               EOF
+       else
+               newins - gentoo-hardened-ld.cfg <<-EOF
+                       # Some of these options are added unconditionally, 
regardless of
+                       # USE=hardened, for parity with sys-devel/gcc.
+                       -Wl,-z,relro
+                       -Wl,-z,now
+               EOF
+       fi
+
+       dodir /usr/include/gentoo
+
+       cat >> "${ED}/usr/include/gentoo/maybe-stddefs.h" <<-EOF || die
+       /* __has_include is an extension, but it's fine, because this is only
+       for Clang anyway. */
+       #if defined __has_include && __has_include (<stdc-predef.h>) && 
!defined(__GLIBC__)
+       # include <stdc-predef.h>
+       #endif
+       EOF
+
+       local fortify_level=$(usex hardened 3 2)
+       # We have to do this because glibc's headers warn if F_S is set
+       # without optimization and that would at the very least be very noisy
+       # during builds and at worst trigger many -Werror builds.
+       cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
+       #ifdef __clang__
+       # pragma clang system_header
+       #endif
+       #ifndef _FORTIFY_SOURCE
+       # if defined(__has_feature)
+       #  define __GENTOO_HAS_FEATURE(x) __has_feature(x)
+       # else
+       #  define __GENTOO_HAS_FEATURE(x) 0
+       # endif
+       #
+       # if !defined(__OPTIMIZE__) || __OPTIMIZE__ == 0
+       # elif !defined(__STDC_HOSTED__) || __STDC_HOSTED__ != 1
+       # elif defined(__SANITIZE_ADDRESS__)
+       # elif __GENTOO_HAS_FEATURE(address_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(hwaddress_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(memory_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(numerical_stability_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(realtime_sanitizer)
+       # elif __GENTOO_HAS_FEATURE(thread_sanitizer)
+       # else
+       #  define _FORTIFY_SOURCE ${fortify_level}
+       # endif
+       #
+       # undef __GENTOO_HAS_FEATURE
+       #endif
+       EOF
+
+       # TODO: Maybe -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST for
+       # non-hardened?
+       if use hardened ; then
+               cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
+                       # Options below are conditional on USE=hardened.
+                       -Xarch_host -D_GLIBCXX_ASSERTIONS
+
+                       # Analogue to GLIBCXX_ASSERTIONS
+                       # 
https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
+                       # 
https://libcxx.llvm.org/Hardening.html#using-hardened-mode
+                       -Xarch_host 
-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE
+               EOF
+
+               cat >> "${ED}/etc/clang/gentoo-hardened-ld.cfg" <<-EOF || die
+                       # Options below are conditional on USE=hardened.
+               EOF
+       fi
+
+       # We only install config files for supported ABIs because unprefixed 
tools
+       # might be used for crosscompilation where e.g. PIE may not be 
supported.
+       # See bug #912237 and bug #901247. Just ${CHOST} won't do due to bug 
#912685.
+       local abi
+       for abi in $(get_all_abis); do
+               local abi_chost=$(get_abi_CHOST "${abi}")
+               doclang_cfg "${abi_chost}"
+       done
+
+       if use kernel_Darwin; then
+               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+                       # Gentoo Prefix on Darwin
+                       -Wl,-search_paths_first
+               EOF
+               if use bootstrap-prefix ; then
+                       # bootstrap-prefix is only set during stage2 of 
bootstrapping
+                       # Prefix, where EPREFIX is set to EPREFIX/tmp.
+                       # Here we need to point it at the future lib dir of the 
stage3's
+                       # EPREFIX.
+                       cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+                               -Wl,-rpath,${EPREFIX}/../usr/lib
+                               -Wl,-L,${EPREFIX}/../usr/lib
+                               -isystem ${EPREFIX}/../usr/include
+                       EOF
+               fi
+               # Using -Wl,-L instead of -L to trick compiler driver to put it
+               # after -isysroot's internal -L
+               cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
+                       -Wl,-rpath,${EPREFIX}/usr/lib
+                       -Wl,-L,${EPREFIX}/usr/lib
+                       -isystem ${EPREFIX}/usr/include
+                       -isysroot ${EPREFIX}/MacOSX.sdk
+               EOF
+       fi
+}
+
+pkg_preinst() {
+       if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
+       then
+               local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
+               if [[ -n ${gcc_path} ]]; then
+                       cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
+                               --gcc-install-dir="${gcc_path%%:*}"
+                       EOF
+               fi
+       fi
+}

Reply via email to