commit: b4131ae12d105fcc6ef4820c28194578a8e01d2a Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Thu Dec 21 23:24:52 2017 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Thu Dec 21 23:24:52 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b4131ae1
sys-libs/compiler-rt-sanitizers: bump to 5.0.1 sys-libs/compiler-rt-sanitizers/Manifest | 11 +++++++---- .../compiler-rt-sanitizers-4.0.1.ebuild | 20 +++++++++++-------- .../compiler-rt-sanitizers-5.0.0.ebuild | 6 ++---- ....ebuild => compiler-rt-sanitizers-5.0.1.ebuild} | 23 +++++++++++++--------- 4 files changed, 35 insertions(+), 25 deletions(-) diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest index 7c6cf87..2b8b4a3 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -1,4 +1,7 @@ -DIST compiler-rt-4.0.1.src.tar.xz 1434100 SHA256 a3c87794334887b93b7a766c507244a7cdcce1d48b2e9249fc9a94f2c3beb440 SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649 WHIRLPOOL 8b33c6841cacefe98da92435418b13b8f8ed97a982903be827e5c37f937dc9001975d6a709d60423b21509dd5670ee2e90cb34c96473fb4a66c2ab6f47af09e5 -DIST compiler-rt-5.0.0.src.tar.xz 1507996 SHA256 d5ad5266462134a482b381f1f8115b6cad3473741b3bb7d1acc7f69fd0f0c0b3 SHA512 5f3fd49736fba35232b0baa19a5f03c4ab3bf85ec16f23355eb3c516fe6d861c14272c224ca2f2092a80636df4307e49a3df1b60a3791949b3f1ba4a0c8c81fb WHIRLPOOL 7ac0eb36b59a7917b694e4b5e9a425a3ffed7c48eda0c211a7d1c52596b2d39fa4bc0a84db5f58492bf7b5b64c22b81cd2fcd8dee2bceb89583b6e190c70d2d8 -DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc -DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb +DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649 +DIST compiler-rt-5.0.0.src.tar.xz 1507996 BLAKE2B 7294b7c4fee6401baaf2a9c9bd22d3f94d57334575ae0d5c599b613990d6f139b72acee8c2c66f6c7bc17378d5258290e749f691cc6c6c5bf9f204e3a76b37a0 SHA512 5f3fd49736fba35232b0baa19a5f03c4ab3bf85ec16f23355eb3c516fe6d861c14272c224ca2f2092a80636df4307e49a3df1b60a3791949b3f1ba4a0c8c81fb +DIST compiler-rt-5.0.1.src.tar.xz 1498220 BLAKE2B 61503df8a4075c2fe1e42d480753b861321b5de127e340f48d648fc38d81c7967cead17e136beaa5235cc92540f158915fccec77cf39aa7c336d106c9d265222 SHA512 61e23775db78bdeed3003a509b45ae609287db31302fed186f3210d481ecf062d1828571e63482215ab00ff732df8f3fa6c77334dfb677e4b76eb555d476b8c4 +DIST compiler-rt-sanitizers-4.0.1-patchset.tar.xz 2384 BLAKE2B 6f9eee711c83570767f0bb634d0f91c18ee7f2af93a478938b8d5b6ce6f2c2fbaadb7bd5c7ee94a14dc1834359a046187db6bc7005b7c2efa539325dc0701ad9 SHA512 72d7357b4c27bbf8fa8b34803ddea905a9f1054e8fc7bf99a4ead9dc00408989ea2709f04be9cf45a27eeb4b9386c89feeb25b53a84f3cac9739196b89813887 +DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d +DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a +DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild index 4057b35..a16b6d3 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild @@ -8,16 +8,17 @@ EAPI=6 CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python2_7 ) -inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1 versionator +inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" -HOMEPAGE="http://llvm.org/"; -SRC_URI="http://releases.llvm.org/${PV/_//}/compiler-rt-${PV/_/}.src.tar.xz - test? ( http://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )" +HOMEPAGE="https://llvm.org/"; +SRC_URI="https://releases.llvm.org/${PV/_//}/compiler-rt-${PV/_/}.src.tar.xz + https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.xz + test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )" LICENSE="|| ( UoI-NCSA MIT )" SLOT="${PV%_*}" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="test" LLVM_SLOT=${SLOT%%.*} @@ -34,9 +35,7 @@ DEPEND=" S=${WORKDIR}/compiler-rt-${PV/_/}.src -PATCHES=( - "${FILESDIR}"/${PN}-4.0.0-musl-patches.patch -) +PATCHES=( "${FILESDIR}"/${PN}-4.0.0-musl-patches.patch ) # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo @@ -66,6 +65,11 @@ src_unpack() { fi } +src_prepare() { + eapply "${WORKDIR}/${P}-patchset" + cmake-utils_src_prepare +} + src_configure() { # pre-set since we need to pass it to cmake BUILD_DIR=${WORKDIR}/${P}_build diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild index 0cff3ff..9237746 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild @@ -8,7 +8,7 @@ EAPI=6 CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python2_7 ) -inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1 versionator +inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1 DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/"; @@ -33,9 +33,7 @@ DEPEND=" S=${WORKDIR}/compiler-rt-${PV/_/}.src -PATCHES=( - "${FILESDIR}"/${PN}-5.0.0-musl-patches.patch -) +PATCHES=( "${FILESDIR}"/${PN}-5.0.0-musl-patches.patch ) # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild similarity index 85% copy from sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild copy to sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild index 0cff3ff..dff3965 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild @@ -8,12 +8,15 @@ EAPI=6 CMAKE_MIN_VERSION=3.7.0-r1 PYTHON_COMPAT=( python2_7 ) -inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1 versionator +inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1 + +MY_P=compiler-rt-${PV/_/}.src +LLVM_P=llvm-${PV/_/}.src DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" HOMEPAGE="https://llvm.org/"; -SRC_URI="https://releases.llvm.org/${PV/_//}/compiler-rt-${PV/_/}.src.tar.xz - test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )" +SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz + test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )" LICENSE="|| ( UoI-NCSA MIT )" SLOT="${PV%_*}" @@ -31,11 +34,9 @@ DEPEND=" sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" -S=${WORKDIR}/compiler-rt-${PV/_/}.src +S=${WORKDIR}/${MY_P} -PATCHES=( - "${FILESDIR}"/${PN}-5.0.0-musl-patches.patch -) +PATCHES=( "${FILESDIR}"/${PN}-5.0.0-musl-patches.patch ) # least intrusive of all CMAKE_BUILD_TYPE=RelWithDebInfo @@ -58,10 +59,14 @@ pkg_setup() { } src_unpack() { - default + einfo "Unpacking ${MY_P}.tar.xz ..." + tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die if use test; then - mv llvm-* llvm || die + einfo "Unpacking parts of ${LLVM_P}.tar.xz ..." + tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \ + "${LLVM_P}"/utils/{lit,unittest} || die + mv "${LLVM_P}" llvm || die fi }
