summaryrefslogtreecommitdiff
path: root/sys-libs/libcxx
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-18 04:54:42 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-03-18 04:54:42 +0000
commit5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (patch)
treec968fff3108e2b4d88e4e564a56bfd066f170573 /sys-libs/libcxx
parent1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (diff)
gentoo resync : 18.03.2018
Diffstat (limited to 'sys-libs/libcxx')
-rw-r--r--sys-libs/libcxx/Manifest10
-rw-r--r--sys-libs/libcxx/libcxx-4.0.1.ebuild10
-rw-r--r--sys-libs/libcxx/libcxx-5.0.1.ebuild10
-rw-r--r--sys-libs/libcxx/libcxx-6.0.0.ebuild14
-rw-r--r--sys-libs/libcxx/libcxx-6.0.9999.ebuild12
-rw-r--r--sys-libs/libcxx/libcxx-9999.ebuild12
6 files changed, 42 insertions, 26 deletions
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 98f20bb569cd..91cd302837d5 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -9,9 +9,9 @@ DIST libcxx-5.0.1.src.tar.xz 1527852 BLAKE2B 9454fbca8228ee456feb79b65a63ce5daa2
DIST libcxx-6.0.0.src.tar.xz 1549328 BLAKE2B 93adb339b0e849fca1850d379c8e74b407b0db8220f3a05f888db70d83ad07c3200dbd2a7827f92c60a2ba91d3395e4d1b4434ba70479c29a95aceda6c213e02 SHA512 3d93910f85a778f36c5f7a4429639008acba5713a2c8ac79a9de09463af6f9a388af45d39af23423a7223660701697ba067f3391f25d5a970973691dd88635e3
EBUILD libcxx-3.7.1.ebuild 5335 BLAKE2B 6f4dbbb8dbc7f6e8b97f05ff3e638bb037bad416feffe5207a9cba166a5c0e0c92c3cac954088cc04cdf2a9be62f17cd5d7ece472e4e20d3c0be5b3c1edb2f52 SHA512 f4e04906e7205cd3d2f3180a0b897c1a9eaf5c65249bdbb62ed32a0455132009c88ae6f080b52abe6973752073ca3bc32e37e3491db9de2fc030cf77e4ed91b0
EBUILD libcxx-3.9.1.ebuild 6815 BLAKE2B d15c83602e244f8a50e0a9d15869dbd4c7be226d8b1f93249cb6658149ad2408f0feada97403a0dfa3dcd8ac25b98ae084d1d17c879f67ae24d33f8497aba569 SHA512 9c9632590b49cd01ad324641ee296f08442940ab1dda1f0c7cdc77abe6b653f70d0baa9b796ef7d77e1f4728e96fe27fcd42d79a389cfcf2b2427b087b9985af
-EBUILD libcxx-4.0.1.ebuild 6301 BLAKE2B d4a17d742479e7532c986046fe12b4aed0d1e59faaebead864f7e3f91c4be82aa5d708a7efe2038a146151d10530b0f31a34006e8af6c4dc24f18537dc8c0feb SHA512 8e4a82071fd5945f7876adc9cd20ed2d35ee952711574e8ac2b735d60299b480e269b07ad829c015377c8042a54b6604ffcfe41f98869b25844c00b62bec3b46
-EBUILD libcxx-5.0.1.ebuild 6301 BLAKE2B 3a8fc402a70214032823a1590a8ca088e16bb84ad0d75acda69c9dc306747e8b9c9fe48179e3c9481765ab656217a7f76ecee9c4a1d6a61d9923fad7c624d8c7 SHA512 ffe69b27e9358cea5a31b64f6a1f335565b2229ba6ecfad5636b813df174daffa6a2ca6f47f30da1d7e833aea803ce2be1e3f95589a379af4c138c212bc0df64
-EBUILD libcxx-6.0.0.ebuild 6714 BLAKE2B 30da012470b16f07f8c58633a966bb85bbb8ef68c1b716c1fb890064f43191ae505ac8a4e1270ec4cb7fc4f1a87589cccd5fbfebb73857df55140498ef1fb0dd SHA512 cb8179594c272aaec459057c23f82b0b5642827b9f93913204b2879cb0b54f512edced1fdde2ba0815ba3a8f1a88cad0398739c39119d9377925be5db4c7bc70
-EBUILD libcxx-6.0.9999.ebuild 7020 BLAKE2B 550b6aba9d3bbdb22a57d989795461d5dd723061623673637f81b0a0847647ce77f5540831d17c86ba26f8aa4571d42c77c0648de85e8aac7107d3bf35981895 SHA512 9e408776b6c6a7806d04ec96d205887493a531691711cfe4c676214c33f99c1494aaeb25307c09c8606c073c10c6ae6e6a894fb958488d2dd41977cfdc0fbdd8
-EBUILD libcxx-9999.ebuild 6992 BLAKE2B ca6c1858b79b56d987ec0ea9aea817ffba40aa9b6a2eeac7bfe3b1303ae849cd434fd0044688fd2220b3940dc52a35d3ee5f1939e030cf3181d5528351ad9604 SHA512 f8690d503888b03b511eae8575b996764ee5c2d4cc7d9afefea9576d635736d653655306d7af1c4028497aeded6e2f423b8ba6dcd08f62a79f0ea846e9532cbf
+EBUILD libcxx-4.0.1.ebuild 6453 BLAKE2B 2cab9946b4b79c4fc5310aae7ad32ae21f28a87e3e43c87731fe0542478342c4c7f5587472c39198b43f2a1f61329fc55a9e5c24804a34f70c70236e017eb964 SHA512 b656520a6bf00a73763fdf6f052869c76adb76ae9650d763c6b78a02393202c9bfeadd807ebafd6a071395aa64a0ede464fad0e4c127dfe39720e13342f82fc0
+EBUILD libcxx-5.0.1.ebuild 6453 BLAKE2B 4d79da76e3c2904a443180c37b63d3486b568d1253ba716c5073df76dd72186d9700e16f49f7d4de0bde61e86538f711a77e42e3df9fcce4baf2903eaead5b5c SHA512 af3c95d85528b54f65f814c107ea5ccd5db293d22bac2856af2b11a7ce75fa41bb7169a23434b0138f5e62fe605bbbbcb050dc05c4b4c4bfa9d576a868552dde
+EBUILD libcxx-6.0.0.ebuild 6699 BLAKE2B 83e6112e8bdc5fc1f86404c2be72b0acb89d251a2f29d098ac1296ff2073a91cdbacc212dc9bbcbaef7c961b15c080cf975f33cb599aebf2e57bcd036d3101be SHA512 7c0eedefdce34ec28e8eed1cf60dd11f510ea3994efe8f01687a46692953f655da8cbc6b2b5b69a3e33e3f895a779ca8d6fadd9ec899e7afd62173549bae34c3
+EBUILD libcxx-6.0.9999.ebuild 6998 BLAKE2B 643fc6c64242e24038fc2fdca37f916d475539372d9beec9692e0f9afdc0078c4221d0cb6fe35939cb94d3c83c298f56626396d5067cf8fc7157718ab0e0a98c SHA512 85ac1785d3495c7df6e080912ddedabf10c6d7ff3323d1b100172d320f081a94bef0f47502b9914f5428e6391c124c5dfb33e52319204a8084a0a1b8432acf33
+EBUILD libcxx-9999.ebuild 6970 BLAKE2B 25154a733062646b8e19da4f38a2ade388140c16b36e4310cdca613d9299a655bbae07a1a476da564c1ef3d32a26f2816533bcd0683051ea104c5711f36e4818 SHA512 91565a2e05a5e48320cc7b7e49ea7722f74a0b80af145a53d9838d84603e51c666fb2a57eceae3231f86e9dde3c051c918286d291a4343c9bd728a7ab429e3f8
MISC metadata.xml 854 BLAKE2B f731ffbb07722face32cfe5ef0576c572fc45d93e8d78ec4adb46c43b95999dc4eb48f20311517fe08a397f2e5dec56c530bb6787a058358cfd1af8d79ffad90 SHA512 8ef3feab266e09442a42baced2d72667fa8b1290624c2c84bab7b173ead72669568847f6e995388fc1d7bc722381f60805d87b2a0cc2d04ae0c49e36bec3802a
diff --git a/sys-libs/libcxx/libcxx-4.0.1.ebuild b/sys-libs/libcxx/libcxx-4.0.1.ebuild
index 8b6e05f5ff3d..64f610ce5bb2 100644
--- a/sys-libs/libcxx/libcxx-4.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-4.0.1.ebuild
@@ -127,8 +127,16 @@ multilib_src_configure() {
# this can be any directory, it just needs to exist...
# FIXME: remove this once https://reviews.llvm.org/D25093 is merged
-DLLVM_MAIN_SRC_DIR="${T}"
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
)
+ if has_version '>=sys-devel/llvm-6'; then
+ mycmakeargs+=(
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ )
+ else
+ mycmakeargs+=(
+ -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+ )
+ fi
fi
cmake-utils_src_configure
}
diff --git a/sys-libs/libcxx/libcxx-5.0.1.ebuild b/sys-libs/libcxx/libcxx-5.0.1.ebuild
index ff69acef1792..885f8b131826 100644
--- a/sys-libs/libcxx/libcxx-5.0.1.ebuild
+++ b/sys-libs/libcxx/libcxx-5.0.1.ebuild
@@ -127,8 +127,16 @@ multilib_src_configure() {
# this can be any directory, it just needs to exist...
# FIXME: remove this once https://reviews.llvm.org/D25093 is merged
-DLLVM_MAIN_SRC_DIR="${T}"
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
)
+ if has_version '>=sys-devel/llvm-6'; then
+ mycmakeargs+=(
+ -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+ )
+ else
+ mycmakeargs+=(
+ -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
+ )
+ fi
fi
cmake-utils_src_configure
}
diff --git a/sys-libs/libcxx/libcxx-6.0.0.ebuild b/sys-libs/libcxx/libcxx-6.0.0.ebuild
index c890013f25c0..5301d5f1fe6c 100644
--- a/sys-libs/libcxx/libcxx-6.0.0.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
LICENSE="|| ( UoI-NCSA MIT )"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd"
IUSE="elibc_glibc elibc_musl +libcxxabi libcxxrt +libunwind +static-libs test"
REQUIRED_USE="libunwind? ( || ( libcxxabi libcxxrt ) )
?? ( libcxxabi libcxxrt )"
@@ -139,20 +139,20 @@ multilib_src_configure() {
)
if use test; then
+ local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+ local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+ [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
mycmakeargs+=(
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
)
fi
cmake-utils_src_configure
}
multilib_src_test() {
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
- sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
-
cmake-utils_src_make check-libcxx
}
diff --git a/sys-libs/libcxx/libcxx-6.0.9999.ebuild b/sys-libs/libcxx/libcxx-6.0.9999.ebuild
index 4e687c722c60..7454f776ff64 100644
--- a/sys-libs/libcxx/libcxx-6.0.9999.ebuild
+++ b/sys-libs/libcxx/libcxx-6.0.9999.ebuild
@@ -151,20 +151,20 @@ multilib_src_configure() {
)
if use test; then
+ local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+ local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+ [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
mycmakeargs+=(
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
)
fi
cmake-utils_src_configure
}
multilib_src_test() {
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
- sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
-
cmake-utils_src_make check-libcxx
}
diff --git a/sys-libs/libcxx/libcxx-9999.ebuild b/sys-libs/libcxx/libcxx-9999.ebuild
index f304a076c171..a4fdb61c8c7d 100644
--- a/sys-libs/libcxx/libcxx-9999.ebuild
+++ b/sys-libs/libcxx/libcxx-9999.ebuild
@@ -150,20 +150,20 @@ multilib_src_configure() {
)
if use test; then
+ local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+ local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}
+
+ [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
mycmakeargs+=(
-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
- -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+ -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}"
)
fi
cmake-utils_src_configure
}
multilib_src_test() {
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
-
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
- sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die
-
cmake-utils_src_make check-libcxx
}