gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-libs/libcxx: Remove libcxxrt from 10+

Browse Source 
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2020-02-14 07:27:21 +01:00
parent 14af743cd3
commit d6c99f29da
3 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sys-libs/libcxx/libcxx-10.0.0.9999.ebuild
View File

@@ -15,15 +15,13 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
KEYWORDS=""
IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
?? ( libcxxabi libcxxrt )"
IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( libcxxabi )"
RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
# llvm-6 for new lit options
# clang-3.9.0 installs necessary target symlinks unconditionally
# which removes the need for MULTILIB_USEDEP
@@ -52,7 +50,7 @@ pkg_setup() {
llvm_pkg_setup
use test && python-any-r1_pkg_setup
if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
if ! use libcxxabi && ! tc-is-gcc ; then
eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
eerror "and try again."
@@ -78,9 +76,6 @@ src_configure() {
if use libcxxabi; then
cxxabi=libcxxabi
cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
elif use libcxxrt; then
cxxabi=libcxxrt
cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
else
local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
cxxabi=libsupc++
@@ -171,7 +166,7 @@ END_LDSCRIPT
gen_static_ldscript() {
local libdir=$(get_libdir)
local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
# Move it first.
mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
@@ -188,7 +183,7 @@ gen_static_ldscript() {
gen_shared_ldscript() {
local libdir=$(get_libdir)
# libsupc++ doesn't have a shared version
local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"

17
sys-libs/libcxx/libcxx-10.0.0_rc2.ebuild
View File

@@ -15,15 +15,13 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
KEYWORDS=""
IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
?? ( libcxxabi libcxxrt )"
IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( libcxxabi )"
RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
# llvm-6 for new lit options
# clang-3.9.0 installs necessary target symlinks unconditionally
# which removes the need for MULTILIB_USEDEP
@@ -52,7 +50,7 @@ pkg_setup() {
llvm_pkg_setup
use test && python-any-r1_pkg_setup
if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
if ! use libcxxabi && ! tc-is-gcc ; then
eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
eerror "and try again."
@@ -78,9 +76,6 @@ src_configure() {
if use libcxxabi; then
cxxabi=libcxxabi
cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
elif use libcxxrt; then
cxxabi=libcxxrt
cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
else
local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
cxxabi=libsupc++
@@ -171,7 +166,7 @@ END_LDSCRIPT
gen_static_ldscript() {
local libdir=$(get_libdir)
local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
# Move it first.
mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
@@ -188,7 +183,7 @@ gen_static_ldscript() {
gen_shared_ldscript() {
local libdir=$(get_libdir)
# libsupc++ doesn't have a shared version
local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"

17
sys-libs/libcxx/libcxx-11.0.0.9999.ebuild
View File

@@ -15,15 +15,13 @@ llvm.org_set_globals
LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
SLOT="0"
KEYWORDS=""
IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
?? ( libcxxabi libcxxrt )"
IUSE="elibc_glibc elibc_musl +libcxxabi +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( libcxxabi )"
RESTRICT="!test? ( test )"
RDEPEND="
libcxxabi? ( ~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
libcxxrt? ( sys-libs/libcxxrt[libunwind=,static-libs?,${MULTILIB_USEDEP}] )
!libcxxabi? ( !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] ) )"
!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )"
# llvm-6 for new lit options
# clang-3.9.0 installs necessary target symlinks unconditionally
# which removes the need for MULTILIB_USEDEP
@@ -52,7 +50,7 @@ pkg_setup() {
llvm_pkg_setup
use test && python-any-r1_pkg_setup
if ! use libcxxabi && ! use libcxxrt && ! tc-is-gcc ; then
if ! use libcxxabi && ! tc-is-gcc ; then
eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
eerror "and try again."
@@ -78,9 +76,6 @@ src_configure() {
if use libcxxabi; then
cxxabi=libcxxabi
cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
elif use libcxxrt; then
cxxabi=libcxxrt
cxxabi_incs="${EPREFIX}/usr/include/libcxxrt"
else
local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
cxxabi=libsupc++
@@ -171,7 +166,7 @@ END_LDSCRIPT
gen_static_ldscript() {
local libdir=$(get_libdir)
local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "$(usex libcxxrt "libcxxrt.a" "libsupc++.a")")
local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
# Move it first.
mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
@@ -188,7 +183,7 @@ gen_static_ldscript() {
gen_shared_ldscript() {
local libdir=$(get_libdir)
# libsupc++ doesn't have a shared version
local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "$(usex libcxxrt "libcxxrt.so" "libsupc++.a")")
local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"