| 1 |
commit: 4533fb756fc521d0e7ff3593aee1eea9cb2b225e |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 29 14:03:42 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 19:56:10 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4533fb75 |
| 7 |
|
| 8 |
sys-libs/libcxx: Bump to 15.0.6 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxx/Manifest | 2 + |
| 13 |
sys-libs/libcxx/libcxx-15.0.6.ebuild | 204 +++++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 206 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest |
| 17 |
index ca3355b320b9..79aea1407ed1 100644 |
| 18 |
--- a/sys-libs/libcxx/Manifest |
| 19 |
+++ b/sys-libs/libcxx/Manifest |
| 20 |
@@ -6,6 +6,8 @@ DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76 |
| 21 |
DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916 |
| 22 |
DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6 |
| 23 |
DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5 |
| 24 |
+DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949 |
| 25 |
+DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c |
| 26 |
DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8 |
| 27 |
DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9 |
| 28 |
DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f |
| 29 |
|
| 30 |
diff --git a/sys-libs/libcxx/libcxx-15.0.6.ebuild b/sys-libs/libcxx/libcxx-15.0.6.ebuild |
| 31 |
new file mode 100644 |
| 32 |
index 000000000000..8b5e382b8889 |
| 33 |
--- /dev/null |
| 34 |
+++ b/sys-libs/libcxx/libcxx-15.0.6.ebuild |
| 35 |
@@ -0,0 +1,204 @@ |
| 36 |
+# Copyright 1999-2022 Gentoo Authors |
| 37 |
+# Distributed under the terms of the GNU General Public License v2 |
| 38 |
+ |
| 39 |
+EAPI=8 |
| 40 |
+ |
| 41 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 42 |
+inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ |
| 43 |
+ toolchain-funcs |
| 44 |
+ |
| 45 |
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
| 46 |
+HOMEPAGE="https://libcxx.llvm.org/" |
| 47 |
+ |
| 48 |
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 49 |
+SLOT="0" |
| 50 |
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86 ~x64-macos" |
| 51 |
+IUSE="+clang +libcxxabi static-libs test" |
| 52 |
+REQUIRED_USE="test? ( clang )" |
| 53 |
+RESTRICT="!test? ( test )" |
| 54 |
+ |
| 55 |
+RDEPEND=" |
| 56 |
+ libcxxabi? ( |
| 57 |
+ ~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}] |
| 58 |
+ ) |
| 59 |
+ !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) |
| 60 |
+" |
| 61 |
+DEPEND=" |
| 62 |
+ ${RDEPEND} |
| 63 |
+ sys-devel/llvm:${LLVM_MAJOR} |
| 64 |
+" |
| 65 |
+BDEPEND=" |
| 66 |
+ clang? ( |
| 67 |
+ sys-devel/clang:${LLVM_MAJOR} |
| 68 |
+ ) |
| 69 |
+ !test? ( |
| 70 |
+ ${PYTHON_DEPS} |
| 71 |
+ ) |
| 72 |
+ test? ( |
| 73 |
+ >=dev-util/cmake-3.16 |
| 74 |
+ sys-devel/gdb[python] |
| 75 |
+ $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
| 76 |
+ ) |
| 77 |
+" |
| 78 |
+ |
| 79 |
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake ) |
| 80 |
+llvm.org_set_globals |
| 81 |
+ |
| 82 |
+python_check_deps() { |
| 83 |
+ use test || return 0 |
| 84 |
+ python_has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 85 |
+} |
| 86 |
+ |
| 87 |
+pkg_setup() { |
| 88 |
+ # Darwin Prefix builds do not have llvm installed yet, so rely on |
| 89 |
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead |
| 90 |
+ # of using llvm_pkg_setup. |
| 91 |
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
| 92 |
+ LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup |
| 93 |
+ fi |
| 94 |
+ python-any-r1_pkg_setup |
| 95 |
+ |
| 96 |
+ if ! use libcxxabi && ! tc-is-gcc ; then |
| 97 |
+ eerror "To build ${PN} against libsupc++, you have to use gcc. Other" |
| 98 |
+ eerror "compilers are not supported. Please set CC=gcc and CXX=g++" |
| 99 |
+ eerror "and try again." |
| 100 |
+ die |
| 101 |
+ fi |
| 102 |
+} |
| 103 |
+ |
| 104 |
+test_compiler() { |
| 105 |
+ $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
| 106 |
+ <<<'int main() { return 0; }' &>/dev/null |
| 107 |
+} |
| 108 |
+ |
| 109 |
+src_configure() { |
| 110 |
+ # note: we need to do this before multilib kicks in since it will |
| 111 |
+ # alter the CHOST |
| 112 |
+ local cxxabi cxxabi_incs |
| 113 |
+ if use libcxxabi; then |
| 114 |
+ cxxabi=system-libcxxabi |
| 115 |
+ cxxabi_incs="${EPREFIX}/usr/include/c++/v1" |
| 116 |
+ else |
| 117 |
+ local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" |
| 118 |
+ cxxabi=libsupc++ |
| 119 |
+ cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 120 |
+ fi |
| 121 |
+ |
| 122 |
+ multilib-minimal_src_configure |
| 123 |
+} |
| 124 |
+ |
| 125 |
+multilib_src_configure() { |
| 126 |
+ if use clang; then |
| 127 |
+ local -x CC=${CHOST}-clang |
| 128 |
+ local -x CXX=${CHOST}-clang++ |
| 129 |
+ strip-unsupported-flags |
| 130 |
+ fi |
| 131 |
+ |
| 132 |
+ # link to compiler-rt |
| 133 |
+ local use_compiler_rt=OFF |
| 134 |
+ [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON |
| 135 |
+ |
| 136 |
+ # bootstrap: cmake is unhappy if compiler can't link to stdlib |
| 137 |
+ local nolib_flags=( -nodefaultlibs -lc ) |
| 138 |
+ if ! test_compiler; then |
| 139 |
+ if test_compiler "${nolib_flags[@]}"; then |
| 140 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 141 |
+ ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 142 |
+ fi |
| 143 |
+ fi |
| 144 |
+ |
| 145 |
+ local libdir=$(get_libdir) |
| 146 |
+ local mycmakeargs=( |
| 147 |
+ -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" |
| 148 |
+ -DPython3_EXECUTABLE="${PYTHON}" |
| 149 |
+ -DLLVM_ENABLE_RUNTIMES=libcxx |
| 150 |
+ -DLLVM_INCLUDE_TESTS=OFF |
| 151 |
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib} |
| 152 |
+ |
| 153 |
+ -DLIBCXX_ENABLE_SHARED=ON |
| 154 |
+ -DLIBCXX_ENABLE_STATIC=$(usex static-libs) |
| 155 |
+ -DLIBCXX_CXX_ABI=${cxxabi} |
| 156 |
+ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} |
| 157 |
+ # we're using our own mechanism for generating linker scripts |
| 158 |
+ -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 159 |
+ -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 160 |
+ -DLIBCXX_INCLUDE_BENCHMARKS=OFF |
| 161 |
+ -DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 162 |
+ -DLIBCXX_USE_COMPILER_RT=${use_compiler_rt} |
| 163 |
+ ) |
| 164 |
+ |
| 165 |
+ if use test; then |
| 166 |
+ mycmakeargs+=( |
| 167 |
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 168 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags)" |
| 169 |
+ -DPython3_EXECUTABLE="${PYTHON}" |
| 170 |
+ ) |
| 171 |
+ fi |
| 172 |
+ cmake_src_configure |
| 173 |
+} |
| 174 |
+ |
| 175 |
+multilib_src_compile() { |
| 176 |
+ cmake_src_compile |
| 177 |
+ if [[ ${CHOST} != *-darwin* ]] ; then |
| 178 |
+ gen_shared_ldscript |
| 179 |
+ use static-libs && gen_static_ldscript |
| 180 |
+ fi |
| 181 |
+} |
| 182 |
+ |
| 183 |
+multilib_src_test() { |
| 184 |
+ local -x LIT_PRESERVES_TMP=1 |
| 185 |
+ cmake_build check-cxx |
| 186 |
+} |
| 187 |
+ |
| 188 |
+multilib_src_install() { |
| 189 |
+ cmake_src_install |
| 190 |
+ # since we've replaced libc++.{a,so} with ldscripts, now we have to |
| 191 |
+ # install the extra symlinks |
| 192 |
+ if [[ ${CHOST} != *-darwin* ]] ; then |
| 193 |
+ dolib.so lib/libc++_shared.so |
| 194 |
+ use static-libs && dolib.a lib/libc++_static.a |
| 195 |
+ fi |
| 196 |
+} |
| 197 |
+ |
| 198 |
+# Usage: deps |
| 199 |
+gen_ldscript() { |
| 200 |
+ local output_format |
| 201 |
+ output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
| 202 |
+ [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
| 203 |
+ |
| 204 |
+ cat <<-END_LDSCRIPT |
| 205 |
+/* GNU ld script |
| 206 |
+ Include missing dependencies |
| 207 |
+*/ |
| 208 |
+${output_format} |
| 209 |
+GROUP ( $@ ) |
| 210 |
+END_LDSCRIPT |
| 211 |
+} |
| 212 |
+ |
| 213 |
+gen_static_ldscript() { |
| 214 |
+ # Move it first. |
| 215 |
+ mv lib/libc++{,_static}.a || die |
| 216 |
+ # Generate libc++.a ldscript for inclusion of its dependencies so that |
| 217 |
+ # clang++ -stdlib=libc++ -static works out of the box. |
| 218 |
+ local deps=( |
| 219 |
+ libc++_static.a |
| 220 |
+ $(usex libcxxabi libc++abi.a libsupc++.a) |
| 221 |
+ ) |
| 222 |
+ # On Linux/glibc it does not link without libpthread or libdl. It is |
| 223 |
+ # fine on FreeBSD. |
| 224 |
+ use elibc_glibc && deps+=( libpthread.a libdl.a ) |
| 225 |
+ |
| 226 |
+ gen_ldscript "${deps[*]}" > lib/libc++.a || die |
| 227 |
+} |
| 228 |
+ |
| 229 |
+gen_shared_ldscript() { |
| 230 |
+ # Move it first. |
| 231 |
+ mv lib/libc++{,_shared}.so || die |
| 232 |
+ local deps=( |
| 233 |
+ libc++_shared.so |
| 234 |
+ # libsupc++ doesn't have a shared version |
| 235 |
+ $(usex libcxxabi libc++abi.so libsupc++.a) |
| 236 |
+ ) |
| 237 |
+ |
| 238 |
+ gen_ldscript "${deps[*]}" > lib/libc++.so || die |
| 239 |
+} |
Archives