summaryrefslogtreecommitdiff
path: root/sys-devel/clang
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel/clang')
-rw-r--r--sys-devel/clang/Manifest11
-rw-r--r--sys-devel/clang/clang-11.0.0.ebuild13
-rw-r--r--sys-devel/clang/clang-11.0.1.9999.ebuild11
-rw-r--r--sys-devel/clang/clang-11.0.1_rc1.ebuild11
-rw-r--r--sys-devel/clang/clang-11.0.1_rc2.ebuild11
-rw-r--r--sys-devel/clang/clang-12.0.0.9999.ebuild11
-rw-r--r--sys-devel/clang/files/9999/prefix-dirs.patch72
7 files changed, 129 insertions, 11 deletions
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 720f80d4c72f..0d0c076421cc 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,5 +1,6 @@
AUX 10.0.1/0004-clang-Avoid-linking-c-index-test-to-duplicate-librar.patch 970 BLAKE2B 564394bea7e9d5a056e7ce39b3e5261f1214637084c1669d34e4d9c3296582732765654ccc2dd76507df2d7fb8406da4185339134fa52bb5c38a2335a55b4f50 SHA512 41050092b31b2558b2d24665f4b5b5bde8b7d50b979c21d57c6e59119dcfa95c3616b873214a8e986268a20436c0895b702547adeb44d6d7576c89de1ba2d587
AUX 8.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533
+AUX 9999/prefix-dirs.patch 3116 BLAKE2B c20ddfc01b1fa205436a093114b886d979d5f7fbd1efe1ba9014c42a22da4ebaa231567cc406dd2a2714cf4338d0da8e43889b978a84c0b822df89edf6979d26 SHA512 a1e156bc5054c3aa08d6ba5e7b4c681404826bf9e3421c819d5ef216d3eff2291c70985f4f9435ba5ae24a7689239f398e5d348c8d4b0a524d220ef7b572aaf1
DIST 10.0.1-0003-clang-tools-extra-Prevent-linking-to-duplicate-.a-li.patch 23184 BLAKE2B 42bfc9401bceea6627703f7611aafe4708e4e745e47e8caa01fb8c7126524ef65e4c135cfd0541bc663bfc52fa8c47342f7f8de462abe283ec353b068d2e3532 SHA512 9561c9ab6dc62257b7626f7898afa667401522817ec57137641f8687549b0b8e531659a5afd5226dd7619126cc67f68235f628cbe639345277415343c4ca3650
DIST llvm-10.0.1-manpages.tar.bz2 180157 BLAKE2B ddf5951c8f5a2a8a80726fd713e6c818c852851a2261e904b484afdb67ac55f2ce10976ca2ca5d81fe2bf4806a72cc7b59f4068741306491a4f39065ca8fb56e SHA512 d3c2470dbd0f3143d64b380f7534ebcacdcf4bc4f140a6014283150007fe615ebd86247cf13b2432165a681614849e8eaab69a8d077f7a51e4e040e28ed33ebc
DIST llvm-11.0.0-manpages.tar.bz2 179592 BLAKE2B d03dff5e7426f4c648d6112dee0fa7a91edf41584290c94c3f738fc65fa82fc6ef47b49c245fb0e741bdf267fc64534311194c476ece4b447649ba2250e61430 SHA512 1cf598f50c99a85a35b03398e4768cd1eafec9d602f788d401120adb91b3b59965216ed7102da26b7c2af7e1bbca4bca8f1d43bb687fcd8ed418e2f7076bdce4
@@ -10,10 +11,10 @@ DIST llvmorg-11.0.1-rc1.tar.gz 122777435 BLAKE2B 23b520d33cf4b641027ee52bb10c617
DIST llvmorg-11.0.1-rc2.tar.gz 122793330 BLAKE2B 5d42f7bd7ba253ac3ca08cf9901c79db5b51b86f0f66c8e63f4f9808ca5fb72cacccfad098b4f6701a34b0d77bdd66fe3839a3962a251eae53776240a2e13b06 SHA512 acda5a5be38cc8aae730c34cd1bb8f29a82e2ed3dd9734ca293ff092d5b30c8c255ab3054245b8f6ed541d5dbf8bc674b744bb2f81788db8826f69a204dda0c3
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
EBUILD clang-10.0.1.ebuild 11828 BLAKE2B e6ee6571b0be8983ea5d23acb899e562758a1cc6f28acc1e82d0b4d8cf5854262fb5f059abf0154e523c075f49ef804255a1ae106982276a1276fd9106d39da3 SHA512 c076072d0c3a1dc91b50dc58af34a0d274217f2d3b138c5fcdeda5e0d669511c1cc5dc3ef2b2332e9bc5b6d8660520def5f03dfb8890c1d7a4701e2915b122ab
-EBUILD clang-11.0.0.ebuild 11582 BLAKE2B 90fae946ded4ba69c2ccd2b3f489255f16e3d1568d6e01f700c26ccf075db7bf313a2190f0495b82fd604f1c14331172f3e0ba517fbbc19cb0d7695f7d0c1353 SHA512 6d1de2f567c938bafecba2536eddd6629b388c3dd9f14130e13eaf8ce64550b9e3745bb35328ec481becc0ba67720a20ea4a6146a4971695b14b913d7d5d5236
-EBUILD clang-11.0.1.9999.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
-EBUILD clang-11.0.1_rc1.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
-EBUILD clang-11.0.1_rc2.ebuild 11563 BLAKE2B ff57ac954fed39956734c6eeb1dc7a1de82e377fa1366aafa214ae844eba0c31b59bf4c42c7f6dbf2f806e92fd48f79deccebc0ac7bf7f83d3bbf5167876aebf SHA512 ebdb0f1442204dcec5c359895ebc5db335f844cf7c801628f6024cbc253583973327648abcaa6717947642ad041d6359accd64ffa2acfa17a15ff6e8c972feff
-EBUILD clang-12.0.0.9999.ebuild 11498 BLAKE2B 4e715e105fe646e9c3af7708685ca1758702f1becb42436611b628dfeec7241a63c5e8feb407ce25f708c4ac58ecacd41a2677e05fb687e8d96a0869633319dd SHA512 adf5827949ccdc26cb159caa96dccd42b21100898a73cf98388cd4cb42d0dbe054b245c18957f4de36b0a6141a7bee7e1393fcc3d6c290f2a7c88285b6593bf8
+EBUILD clang-11.0.0.ebuild 11810 BLAKE2B 2afbd9ccc9e2c444105f5cf2e490fcefcbbed19a12a4eed72bc46e1ac314fc7197c92e3abb1d570e0ab9684e3f8872dbe5741102bdd9a6f03db0821a4737498c SHA512 5e2884a6518c0b40691e495bcb0fe6beefdfabb08ba9cd946e3a4b220c7bee5539910a818940c41dff823297fa847b08f58251f615cbed78f825d5a2a1cde67a
+EBUILD clang-11.0.1.9999.ebuild 11780 BLAKE2B 8e35eaf812257c5346ebe9fdf4216a3d1c1f3925924d126b269513445de031bda9285a596cec5dc75ae3fc399a2cbab779affb39dee4c7e56b5d0512544b05f7 SHA512 8cf7c6529718b7b996ba6c50c184a50f9ad5b933db539781f5f78a0c43f4deec98df56ec729197068a518fcd08d5b52367a218c30665abcbec7e423ed2d18e3c
+EBUILD clang-11.0.1_rc1.ebuild 11780 BLAKE2B 8e35eaf812257c5346ebe9fdf4216a3d1c1f3925924d126b269513445de031bda9285a596cec5dc75ae3fc399a2cbab779affb39dee4c7e56b5d0512544b05f7 SHA512 8cf7c6529718b7b996ba6c50c184a50f9ad5b933db539781f5f78a0c43f4deec98df56ec729197068a518fcd08d5b52367a218c30665abcbec7e423ed2d18e3c
+EBUILD clang-11.0.1_rc2.ebuild 11780 BLAKE2B 8e35eaf812257c5346ebe9fdf4216a3d1c1f3925924d126b269513445de031bda9285a596cec5dc75ae3fc399a2cbab779affb39dee4c7e56b5d0512544b05f7 SHA512 8cf7c6529718b7b996ba6c50c184a50f9ad5b933db539781f5f78a0c43f4deec98df56ec729197068a518fcd08d5b52367a218c30665abcbec7e423ed2d18e3c
+EBUILD clang-12.0.0.9999.ebuild 11715 BLAKE2B 75971e9e6be8c56992c5acf528ce12f5de88bee8444995c91c3d322bc4b1d4346130639c265017520198640bd8d8be1f89ee0c61cbaae2ac4461cb4ca4ad8df1 SHA512 320ded433b9ec7081c3d52a50f418217548f4736285ae89cbf083d1a15240a21f514f55cec2893b42efd66a3f5905aabaa8c9cd1c06fe77725a0a1ff67f6d997
EBUILD clang-9.0.1.ebuild 9020 BLAKE2B 7c5f8d85d4c6c4d1541c14ff36f2b93ebd553b3ff11e1c9d90dc6eb406b9a7f4072ec08d508cad4efebdfc0d622750a0cba8b24a21b8a053ccabac99bfa750e5 SHA512 6eb0b5558982ad0c43b9478f4ca25c4aadc7a7ed0e4cabd0b918b75613e7d3fac88c0cd09d1616fa88618b7b5b5783b35d3a5b9b9a3b2f7366863aac738e2743
MISC metadata.xml 1336 BLAKE2B aaddc1c1193323466a545df21dfa53b637c3edff4f61cd55037d8327273457cf8d35cad7b92a2eef31acfb055a3e1ed93cb53a913b01eddf43b7b3dc6de880c4 SHA512 0538198df449cdf4d0cd00cb50d7c6883b06524419a29c4376cdcaed440fb84cfbd4983a1a025ae9a6e2fc5d91a4870bfcde587c493d8b617baec2214705601c
diff --git a/sys-devel/clang/clang-11.0.0.ebuild b/sys-devel/clang/clang-11.0.0.ebuild
index cf0dde1f1604..1d4f4bad16c9 100644
--- a/sys-devel/clang/clang-11.0.0.ebuild
+++ b/sys-devel/clang/clang-11.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit cmake llvm llvm.org multilib-minimal pax-utils \
- python-single-r1 toolchain-funcs
+ prefix python-single-r1 toolchain-funcs
DESCRIPTION="C language family frontend for LLVM"
HOMEPAGE="https://llvm.org/"
@@ -30,7 +30,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x64-macos"
IUSE="debug default-compiler-rt default-libcxx default-lld
doc +static-analyzer test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -75,6 +75,10 @@ PDEPEND="
# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
# multilib clang* libraries (not runtime, not wrappers).
+PATCHES=(
+ "${FILESDIR}"/9999/prefix-dirs.patch
+)
+
pkg_setup() {
LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
python-single-r1_pkg_setup
@@ -88,6 +92,11 @@ src_prepare() {
llvm.org_src_prepare
mv ../clang-tools-extra tools/extra || die
+
+ # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+ eprefixify \
+ lib/Frontend/InitHeaderSearch.cpp \
+ lib/Driver/ToolChains/Darwin.cpp || die
}
check_distribution_components() {
diff --git a/sys-devel/clang/clang-11.0.1.9999.ebuild b/sys-devel/clang/clang-11.0.1.9999.ebuild
index 4a3a05b4df86..c5362450b519 100644
--- a/sys-devel/clang/clang-11.0.1.9999.ebuild
+++ b/sys-devel/clang/clang-11.0.1.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit cmake llvm llvm.org multilib-minimal pax-utils \
- python-single-r1 toolchain-funcs
+ prefix python-single-r1 toolchain-funcs
DESCRIPTION="C language family frontend for LLVM"
HOMEPAGE="https://llvm.org/"
@@ -77,6 +77,10 @@ llvm.org_set_globals
# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
# multilib clang* libraries (not runtime, not wrappers).
+PATCHES=(
+ "${FILESDIR}"/9999/prefix-dirs.patch
+)
+
pkg_setup() {
LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
python-single-r1_pkg_setup
@@ -90,6 +94,11 @@ src_prepare() {
llvm.org_src_prepare
mv ../clang-tools-extra tools/extra || die
+
+ # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+ eprefixify \
+ lib/Frontend/InitHeaderSearch.cpp \
+ lib/Driver/ToolChains/Darwin.cpp || die
}
check_distribution_components() {
diff --git a/sys-devel/clang/clang-11.0.1_rc1.ebuild b/sys-devel/clang/clang-11.0.1_rc1.ebuild
index 4a3a05b4df86..c5362450b519 100644
--- a/sys-devel/clang/clang-11.0.1_rc1.ebuild
+++ b/sys-devel/clang/clang-11.0.1_rc1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit cmake llvm llvm.org multilib-minimal pax-utils \
- python-single-r1 toolchain-funcs
+ prefix python-single-r1 toolchain-funcs
DESCRIPTION="C language family frontend for LLVM"
HOMEPAGE="https://llvm.org/"
@@ -77,6 +77,10 @@ llvm.org_set_globals
# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
# multilib clang* libraries (not runtime, not wrappers).
+PATCHES=(
+ "${FILESDIR}"/9999/prefix-dirs.patch
+)
+
pkg_setup() {
LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
python-single-r1_pkg_setup
@@ -90,6 +94,11 @@ src_prepare() {
llvm.org_src_prepare
mv ../clang-tools-extra tools/extra || die
+
+ # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+ eprefixify \
+ lib/Frontend/InitHeaderSearch.cpp \
+ lib/Driver/ToolChains/Darwin.cpp || die
}
check_distribution_components() {
diff --git a/sys-devel/clang/clang-11.0.1_rc2.ebuild b/sys-devel/clang/clang-11.0.1_rc2.ebuild
index 4a3a05b4df86..c5362450b519 100644
--- a/sys-devel/clang/clang-11.0.1_rc2.ebuild
+++ b/sys-devel/clang/clang-11.0.1_rc2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit cmake llvm llvm.org multilib-minimal pax-utils \
- python-single-r1 toolchain-funcs
+ prefix python-single-r1 toolchain-funcs
DESCRIPTION="C language family frontend for LLVM"
HOMEPAGE="https://llvm.org/"
@@ -77,6 +77,10 @@ llvm.org_set_globals
# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
# multilib clang* libraries (not runtime, not wrappers).
+PATCHES=(
+ "${FILESDIR}"/9999/prefix-dirs.patch
+)
+
pkg_setup() {
LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
python-single-r1_pkg_setup
@@ -90,6 +94,11 @@ src_prepare() {
llvm.org_src_prepare
mv ../clang-tools-extra tools/extra || die
+
+ # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+ eprefixify \
+ lib/Frontend/InitHeaderSearch.cpp \
+ lib/Driver/ToolChains/Darwin.cpp || die
}
check_distribution_components() {
diff --git a/sys-devel/clang/clang-12.0.0.9999.ebuild b/sys-devel/clang/clang-12.0.0.9999.ebuild
index e5da1c5cedb4..8ebb9ceea5ec 100644
--- a/sys-devel/clang/clang-12.0.0.9999.ebuild
+++ b/sys-devel/clang/clang-12.0.0.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..9} )
inherit cmake llvm llvm.org multilib-minimal pax-utils \
- python-single-r1 toolchain-funcs
+ prefix python-single-r1 toolchain-funcs
DESCRIPTION="C language family frontend for LLVM"
HOMEPAGE="https://llvm.org/"
@@ -77,6 +77,10 @@ llvm.org_set_globals
# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
# multilib clang* libraries (not runtime, not wrappers).
+PATCHES=(
+ "${FILESDIR}"/9999/prefix-dirs.patch
+)
+
pkg_setup() {
LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
python-single-r1_pkg_setup
@@ -88,6 +92,11 @@ src_prepare() {
BUILD_DIR=${WORKDIR}/x/y/clang
llvm.org_src_prepare
+
+ # add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+ eprefixify \
+ lib/Frontend/InitHeaderSearch.cpp \
+ lib/Driver/ToolChains/Darwin.cpp || die
}
check_distribution_components() {
diff --git a/sys-devel/clang/files/9999/prefix-dirs.patch b/sys-devel/clang/files/9999/prefix-dirs.patch
new file mode 100644
index 000000000000..d8d79b8fb513
--- /dev/null
+++ b/sys-devel/clang/files/9999/prefix-dirs.patch
@@ -0,0 +1,72 @@
+This mirrors cmake-*-prefix-dirs.patch
+
+It add EPREFIX to search paths for c/cxx headers.
+It also adds EPREFIX/MacOSX.sdk to search paths for c and Frameworks.
+Assumes that c++ lib and headers will be installed in the prefix.
+
+Also, a couple of args are populated by inspecting the SDK,
+so, default to EPREFIX/MacOSX.sdk when the sysroot is not specified.
+(This does NOT set sysroot).
+
+--- a/clang/lib/Frontend/InitHeaderSearch.cpp 2020-11-30 12:53:42.000000000 -0600
++++ b/clang/lib/Frontend/InitHeaderSearch.cpp 2020-11-30 13:57:52.000000000 -0600
+@@ -445,6 +445,9 @@
+ // All header search logic is handled in the Driver for Darwin.
+ if (triple.isOSDarwin()) {
+ if (HSOpts.UseStandardSystemIncludes) {
++ // Add Gentoo Prefix framework dirs first
++ AddPath("@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk/System/Library/Frameworks", System, true);
++ AddPath("@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk/Library/Frameworks", System, true);
+ // Add the default framework include paths on Darwin.
+ AddPath("/System/Library/Frameworks", System, true);
+ AddPath("/Library/Frameworks", System, true);
+--- a/clang/lib/Driver/ToolChains/Darwin.cpp 2020-10-07 05:10:48.000000000 -0500
++++ b/clang/lib/Driver/ToolChains/Darwin.cpp 2020-11-30 12:57:15.000000000 -0600
+@@ -1737,9 +1737,9 @@
+ const ArgList &Args,
+ const Driver &TheDriver) {
+ const Arg *A = Args.getLastArg(options::OPT_isysroot);
+- if (!A)
+- return None;
+- StringRef isysroot = A->getValue();
++ //if (!A)
++ // return None;
++ StringRef isysroot = A ? A->getValue() : "@GENTOO_PORTAGE_EPREFIX@/MacOSX.sdk";
+ auto SDKInfoOrErr = driver::parseDarwinSDKInfo(VFS, isysroot);
+ if (!SDKInfoOrErr) {
+ llvm::consumeError(SDKInfoOrErr.takeError());
+@@ -1921,13 +1921,14 @@
+ return DriverArgs.getLastArgValue(options::OPT_isysroot);
+ if (!getDriver().SysRoot.empty())
+ return getDriver().SysRoot;
+- return "/";
++ return "@GENTOO_PORTAGE_EPREFIX@/";
+ }
+
+ void DarwinClang::AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
+ llvm::opt::ArgStringList &CC1Args) const {
+ const Driver &D = getDriver();
+
++ // Sysroot is effectively Gentoo EPREFIX when -isysroot/-sysroot is not defined
+ llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
+
+ bool NoStdInc = DriverArgs.hasArg(options::OPT_nostdinc);
+@@ -1969,6 +1970,10 @@
+ SmallString<128> P(Sysroot);
+ llvm::sys::path::append(P, "usr", "include");
+ addExternCSystemInclude(DriverArgs, CC1Args, P.str());
++ // And add <sysroot>/MacOSX.sdk/usr/include.
++ SmallString<128> Psdk(Sysroot);
++ llvm::sys::path::append(Psdk, "MacOSX.sdk", "usr", "include");
++ addExternCSystemInclude(DriverArgs, CC1Args, Psdk.str());
+ }
+ }
+
+@@ -2017,6 +2022,7 @@
+ DriverArgs.hasArg(options::OPT_nostdincxx))
+ return;
+
++ // Sysroot is effectively Gentoo EPREFIX when -isysroot/-sysroot is not defined
+ llvm::StringRef Sysroot = GetHeaderSysroot(DriverArgs);
+
+ switch (GetCXXStdlibType(DriverArgs)) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 21:49:19 +0000