| 1 |
commit: 7c21e338c43b7625c1f659ba598c4657d1cc6911 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 27 08:47:03 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 30 07:34:49 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c21e338 |
| 7 |
|
| 8 |
sys-libs/libcxx: Bump to 14.0.3 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxx/Manifest | 2 + |
| 13 |
sys-libs/libcxx/libcxx-14.0.3.ebuild | 228 +++++++++++++++++++++++++++++++++++ |
| 14 |
2 files changed, 230 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest |
| 17 |
index ff66dc775cb3..716655034895 100644 |
| 18 |
--- a/sys-libs/libcxx/Manifest |
| 19 |
+++ b/sys-libs/libcxx/Manifest |
| 20 |
@@ -1,7 +1,9 @@ |
| 21 |
DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249 |
| 22 |
DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01 |
| 23 |
DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc248c00ff6778f1a14e3e7999e5d52a1b0b9c3b2e66e8c008e27c62c6c3c08009dc7d9d083ca53698138258ac972e4ad03c042 SHA512 a9f071ad0a792f558105a64790f9e470d8aaed05bd1baabbe86539760c881f772602a03265e0962d8599f991f7fd44d14a49e2ef9d74bb5eb283f473f4084d32 |
| 24 |
+DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6 |
| 25 |
DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc |
| 26 |
DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1 |
| 27 |
DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f |
| 28 |
DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2 |
| 29 |
+DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646 |
| 30 |
|
| 31 |
diff --git a/sys-libs/libcxx/libcxx-14.0.3.ebuild b/sys-libs/libcxx/libcxx-14.0.3.ebuild |
| 32 |
new file mode 100644 |
| 33 |
index 000000000000..4d6be5bcc7f2 |
| 34 |
--- /dev/null |
| 35 |
+++ b/sys-libs/libcxx/libcxx-14.0.3.ebuild |
| 36 |
@@ -0,0 +1,228 @@ |
| 37 |
+# Copyright 1999-2022 Gentoo Authors |
| 38 |
+# Distributed under the terms of the GNU General Public License v2 |
| 39 |
+ |
| 40 |
+EAPI=8 |
| 41 |
+ |
| 42 |
+CMAKE_ECLASS=cmake |
| 43 |
+PYTHON_COMPAT=( python3_{8..10} ) |
| 44 |
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs |
| 45 |
+ |
| 46 |
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11" |
| 47 |
+HOMEPAGE="https://libcxx.llvm.org/" |
| 48 |
+ |
| 49 |
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 50 |
+SLOT="0" |
| 51 |
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" |
| 52 |
+IUSE="+libcxxabi +libunwind static-libs test" |
| 53 |
+RESTRICT="!test? ( test )" |
| 54 |
+REQUIRED_USE="libunwind? ( libcxxabi )" |
| 55 |
+ |
| 56 |
+RDEPEND=" |
| 57 |
+ libcxxabi? ( |
| 58 |
+ ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] |
| 59 |
+ ) |
| 60 |
+ !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) |
| 61 |
+" |
| 62 |
+# llvm-6 for new lit options |
| 63 |
+# clang-3.9.0 installs necessary target symlinks unconditionally |
| 64 |
+# which removes the need for MULTILIB_USEDEP |
| 65 |
+DEPEND=" |
| 66 |
+ ${RDEPEND} |
| 67 |
+ >=sys-devel/llvm-6 |
| 68 |
+" |
| 69 |
+BDEPEND=" |
| 70 |
+ !test? ( |
| 71 |
+ ${PYTHON_DEPS} |
| 72 |
+ ) |
| 73 |
+ test? ( |
| 74 |
+ >=dev-util/cmake-3.16 |
| 75 |
+ >=sys-devel/clang-3.9.0 |
| 76 |
+ sys-devel/gdb[python] |
| 77 |
+ $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') |
| 78 |
+ ) |
| 79 |
+" |
| 80 |
+ |
| 81 |
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake ) |
| 82 |
+LLVM_PATCHSET=${PV} |
| 83 |
+llvm.org_set_globals |
| 84 |
+ |
| 85 |
+python_check_deps() { |
| 86 |
+ use test || return 0 |
| 87 |
+ has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 88 |
+} |
| 89 |
+ |
| 90 |
+pkg_setup() { |
| 91 |
+ # Darwin Prefix builds do not have llvm installed yet, so rely on |
| 92 |
+ # bootstrap-prefix to set the appropriate path vars to LLVM instead |
| 93 |
+ # of using llvm_pkg_setup. |
| 94 |
+ if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then |
| 95 |
+ llvm_pkg_setup |
| 96 |
+ fi |
| 97 |
+ python-any-r1_pkg_setup |
| 98 |
+ |
| 99 |
+ if ! use libcxxabi && ! tc-is-gcc ; then |
| 100 |
+ eerror "To build ${PN} against libsupc++, you have to use gcc. Other" |
| 101 |
+ eerror "compilers are not supported. Please set CC=gcc and CXX=g++" |
| 102 |
+ eerror "and try again." |
| 103 |
+ die |
| 104 |
+ fi |
| 105 |
+} |
| 106 |
+ |
| 107 |
+test_compiler() { |
| 108 |
+ $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \ |
| 109 |
+ <<<'int main() { return 0; }' &>/dev/null |
| 110 |
+} |
| 111 |
+ |
| 112 |
+src_configure() { |
| 113 |
+ # note: we need to do this before multilib kicks in since it will |
| 114 |
+ # alter the CHOST |
| 115 |
+ local cxxabi cxxabi_incs |
| 116 |
+ if use libcxxabi; then |
| 117 |
+ cxxabi=system-libcxxabi |
| 118 |
+ cxxabi_incs="${EPREFIX}/usr/include/libcxxabi" |
| 119 |
+ else |
| 120 |
+ local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)" |
| 121 |
+ cxxabi=libsupc++ |
| 122 |
+ cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}" |
| 123 |
+ fi |
| 124 |
+ |
| 125 |
+ multilib-minimal_src_configure |
| 126 |
+} |
| 127 |
+ |
| 128 |
+multilib_src_configure() { |
| 129 |
+ # we want -lgcc_s for unwinder, and for compiler runtime when using |
| 130 |
+ # gcc, clang with gcc runtime (or any unknown compiler) |
| 131 |
+ local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF |
| 132 |
+ if use libunwind; then |
| 133 |
+ # work-around missing -lunwind upstream |
| 134 |
+ extra_libs+=( -lunwind ) |
| 135 |
+ # if we're using libunwind and clang with compiler-rt, we want |
| 136 |
+ # to link to compiler-rt instead of -lgcc_s |
| 137 |
+ if tc-is-clang; then |
| 138 |
+ local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
| 139 |
+ ${LDFLAGS} -print-libgcc-file-name) |
| 140 |
+ if [[ ${compiler_rt} == *libclang_rt* ]]; then |
| 141 |
+ want_gcc_s=OFF |
| 142 |
+ want_compiler_rt=ON |
| 143 |
+ extra_libs+=( "${compiler_rt}" ) |
| 144 |
+ fi |
| 145 |
+ fi |
| 146 |
+ elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then |
| 147 |
+ # clang-based darwin prefix disables libunwind useflag during |
| 148 |
+ # bootstrap, because libunwind is not in the prefix yet. |
| 149 |
+ # override the default, though, because clang based libcxx |
| 150 |
+ # should never use gcc_s on Darwin. |
| 151 |
+ want_gcc_s=OFF |
| 152 |
+ # compiler_rt is not available in EPREFIX during bootstrap, |
| 153 |
+ # so we cannot link to it yet anyway, so keep the defaults |
| 154 |
+ # of want_compiler_rt=OFF and extra_libs=() |
| 155 |
+ fi |
| 156 |
+ |
| 157 |
+ # bootstrap: cmake is unhappy if compiler can't link to stdlib |
| 158 |
+ local nolib_flags=( -nodefaultlibs -lc ) |
| 159 |
+ if ! test_compiler; then |
| 160 |
+ if test_compiler "${nolib_flags[@]}"; then |
| 161 |
+ local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}" |
| 162 |
+ ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}" |
| 163 |
+ fi |
| 164 |
+ fi |
| 165 |
+ |
| 166 |
+ local libdir=$(get_libdir) |
| 167 |
+ local mycmakeargs=( |
| 168 |
+ -DPython3_EXECUTABLE="${PYTHON}" |
| 169 |
+ -DLLVM_ENABLE_RUNTIMES=libcxx |
| 170 |
+ -DLLVM_INCLUDE_TESTS=OFF |
| 171 |
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib} |
| 172 |
+ |
| 173 |
+ -DLIBCXX_ENABLE_SHARED=ON |
| 174 |
+ -DLIBCXX_ENABLE_STATIC=$(usex static-libs) |
| 175 |
+ -DLIBCXX_CXX_ABI=${cxxabi} |
| 176 |
+ -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs} |
| 177 |
+ # we're using our own mechanism for generating linker scripts |
| 178 |
+ -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 179 |
+ -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 180 |
+ -DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s} |
| 181 |
+ -DLIBCXX_INCLUDE_BENCHMARKS=OFF |
| 182 |
+ -DLIBCXX_INCLUDE_TESTS=$(usex test) |
| 183 |
+ -DLIBCXX_USE_COMPILER_RT=${want_compiler_rt} |
| 184 |
+ -DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s} |
| 185 |
+ -DLIBCXX_TARGET_TRIPLE="${CHOST}" |
| 186 |
+ -DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}" |
| 187 |
+ ) |
| 188 |
+ |
| 189 |
+ if use test; then |
| 190 |
+ local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 191 |
+ [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
| 192 |
+ |
| 193 |
+ mycmakeargs+=( |
| 194 |
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 195 |
+ -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" |
| 196 |
+ -DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON |
| 197 |
+ -DPython3_EXECUTABLE="${PYTHON}" |
| 198 |
+ ) |
| 199 |
+ fi |
| 200 |
+ cmake_src_configure |
| 201 |
+} |
| 202 |
+ |
| 203 |
+multilib_src_test() { |
| 204 |
+ local -x LIT_PRESERVES_TMP=1 |
| 205 |
+ cmake_build check-cxx |
| 206 |
+} |
| 207 |
+ |
| 208 |
+# Usage: deps |
| 209 |
+gen_ldscript() { |
| 210 |
+ local output_format |
| 211 |
+ output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p') |
| 212 |
+ [[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )" |
| 213 |
+ |
| 214 |
+ cat <<-END_LDSCRIPT |
| 215 |
+/* GNU ld script |
| 216 |
+ Include missing dependencies |
| 217 |
+*/ |
| 218 |
+${output_format} |
| 219 |
+GROUP ( $@ ) |
| 220 |
+END_LDSCRIPT |
| 221 |
+} |
| 222 |
+ |
| 223 |
+gen_static_ldscript() { |
| 224 |
+ local libdir=$(get_libdir) |
| 225 |
+ local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a") |
| 226 |
+ |
| 227 |
+ # Move it first. |
| 228 |
+ mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die |
| 229 |
+ # Generate libc++.a ldscript for inclusion of its dependencies so that |
| 230 |
+ # clang++ -stdlib=libc++ -static works out of the box. |
| 231 |
+ local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)" |
| 232 |
+ # On Linux/glibc it does not link without libpthread or libdl. It is |
| 233 |
+ # fine on FreeBSD. |
| 234 |
+ use elibc_glibc && deps+=" libpthread.a libdl.a" |
| 235 |
+ |
| 236 |
+ gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die |
| 237 |
+} |
| 238 |
+ |
| 239 |
+gen_shared_ldscript() { |
| 240 |
+ local libdir=$(get_libdir) |
| 241 |
+ # libsupc++ doesn't have a shared version |
| 242 |
+ local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a") |
| 243 |
+ |
| 244 |
+ mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die |
| 245 |
+ local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)" |
| 246 |
+ |
| 247 |
+ gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die |
| 248 |
+} |
| 249 |
+ |
| 250 |
+multilib_src_install() { |
| 251 |
+ cmake_src_install |
| 252 |
+ if [[ ${CHOST} != *-darwin* ]] ; then |
| 253 |
+ gen_shared_ldscript |
| 254 |
+ use static-libs && gen_static_ldscript |
| 255 |
+ fi |
| 256 |
+} |
| 257 |
+ |
| 258 |
+pkg_postinst() { |
| 259 |
+ elog "This package (${PN}) is mainly intended as a replacement for the C++" |
| 260 |
+ elog "standard library when using clang." |
| 261 |
+ elog "To use it, instead of libstdc++, use:" |
| 262 |
+ elog " clang++ -stdlib=libc++" |
| 263 |
+ elog "to compile your C++ programs." |
| 264 |
+} |
Archives