From b2be182d49eea46686b5cf2680d457df61e89dc4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jun 2018 08:49:38 +0100 Subject: gentoo resync : 30.06.2018 --- sys-devel/clang/Manifest | 9 +- sys-devel/clang/clang-6.0.0-r1.ebuild | 2 +- sys-devel/clang/clang-6.0.1.ebuild | 322 +++++++++++++++++++++ ...oss-DSO-CFI-Android-sanitizer-test-for-rt.patch | 30 -- ...oss-DSO-CFI-Android-sanitizer-test-for-rt.patch | 30 ++ 5 files changed, 360 insertions(+), 33 deletions(-) create mode 100644 sys-devel/clang/clang-6.0.1.ebuild delete mode 100644 sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch create mode 100644 sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch (limited to 'sys-devel/clang') diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index ed5c7bcd6dfc..261b07fa0f69 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -7,15 +7,17 @@ AUX 5.0.1/0002-test-Fix-clang-test-for-FreeBSD-and-NetBSD.patch 2846 BLAKE2B a5d AUX 5.0.1/darwin_prefix-include-paths.patch 690 BLAKE2B cfb96eb259fb7d557d215be08ea3babcae6dc1353171fad7f297f787d476d28768c7c1bbe6efc7404ea638f1dc6b4b36e1c17e141faf82be623bbd96d5e09118 SHA512 5f8ecabaf43853964bffeb3953b205bea7e8928fd53637d01842723ac8344e19cc639f6f06c199f2be88b73e60b6eab1987bc5ee7dfeaea5e710eacab90f3533 AUX 5.0.1/extra/0001-Assume-the-shared-library-path-variable-is-LD_LIBRAR.patch 1376 BLAKE2B baa36d2b05118859ffc5af12e9b5a8ed0dac3c262736ef2bab5f89049267dca5a94e134b078c06f09cafcc678fb8adefcf84f940806b594777a1f05a1e216a80 SHA512 f4e31053c03429528fc193a4550784b21d60fa0487700c1f416952c5d92b71988ca481b53c00f95f0c8c39f5f30e9ddd5cc6bee5334294fd3e4df24b8a450e69 AUX 6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch 2041 BLAKE2B 27d95ce8b9eb0aa2536db6eafae8c6c72b2446f8b839338bcdfd7136ef8fcf5f5b4f3a38dffb04c73d603d8da418475edf925b2a1dc6058b00fa1e4fae048bc6 SHA512 ce45081a6a77584142502af43b77b00e6e6857dc37f04ba872453585ec007fd4cf2548cce07d1450ef8f3ece8ea7850c63ab023545330714649a6e2035f04100 -AUX 6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch 1256 BLAKE2B e71f32b08defa1ba59b574e9314e272107638676f1b1469a448efced144c680ffde4d76e34fa3fa5786859bf6e04050bd23150d7c0b98f8849f5d9355eacb646 SHA512 260096c1c7e6ba6f35537873cb6ba83f2271cb50446c50f6f1a5c88138c23508df16c99cac8664b5be0d56f2e0fe288f51a27424ff0b56c317d7a7e07562e0fc +AUX 6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch 1256 BLAKE2B e71f32b08defa1ba59b574e9314e272107638676f1b1469a448efced144c680ffde4d76e34fa3fa5786859bf6e04050bd23150d7c0b98f8849f5d9355eacb646 SHA512 260096c1c7e6ba6f35537873cb6ba83f2271cb50446c50f6f1a5c88138c23508df16c99cac8664b5be0d56f2e0fe288f51a27424ff0b56c317d7a7e07562e0fc DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964 DIST cfe-5.0.1.src.tar.xz 11483036 BLAKE2B c4eb54cd8271b62cf7a2219db0b599b68c00b6e574d1946220efbd1633e841796e6717d6eeb35e84a6db32a731a3285b59cedeb3b1a8f3c3c502b799fdd0a720 SHA512 6619177a2ff9934fe8b15d6aa229abb8e34d0b1a75228d9efba9393daf71d6419a7256de57b31e2f9f829f71f842118556f996e86ee076f1e0a7cd394dfd31a2 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1 DIST cfe-6.0.0.src.tar.xz 11959224 BLAKE2B 257edbaedf72bd941b67b4aa2f152a96a37bbea72d21d22d4445152685efe40d75b9a7a39955545643e841ad6693ef12e52b207b9119098774f39e858b64bc09 SHA512 e886dd27448503bbfc7fd4f68eb089c19b2f2be4f0e5b26d3df253833f60b91d70b472a6b530063386e2252075b110ce9f5942800feddf6c34b94a75cf7bd5c6 +DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9 DIST clang-tools-extra-4.0.1.src.tar.xz 581788 BLAKE2B 52ca89eda6fe1e0fbbdc46e17f4067f03a9a9440dcdcc98811651087d0c9ab24dfe3eefb0b80a32ec41abe0766cb3e47031de61c4cff02b7d0e08c8fd03e3faa SHA512 ea26d926f428e62e76cf8a073e63ffe05645f6592e05d7717d5c257908870ae9217727d3e1578227b14eda5937085872463f1a8e99970256179c68b8a92e69e0 DIST clang-tools-extra-5.0.1.src.tar.xz 646328 BLAKE2B 472eb1e73a17564790919ec392dddcd91f131c1cbf2a5f3cab09a9f7126d4d18ec6785ffcb3c3230eec6edc90acbe2bf859367c37f62ba77d7542f4c18b925f3 SHA512 2e6a811cccd22281f7567f5626ff0484ed1fefee4a9244a717e3ccb9516dce9e7ff315044fb10e505e91c3f1c6d2774558debb9559915d053886599bcb153d7b DIST clang-tools-extra-5.0.2.src.tar.xz 646272 BLAKE2B 8a15a0c3ed9e8c31706d744017aa8be52616037790075c2314c3a613c9e1aa86b0b980c4e3bd9a775b234440f17436392196b41f1691ab25a33b432a25affb68 SHA512 241d85652e7c3ad5d77754ad9a694bddab3c14098067da4119223007c5a4a765d1cd7e7c7dba91666ccd5506f8703c82c9ee487f28249a00c2c4edbd0d1f2640 DIST clang-tools-extra-6.0.0.src.tar.xz 757680 BLAKE2B 708e21055a702c41a94f6b8673bab405f8b1339a75ec66f14c31565ef802245900bafc25e636c6e82f01e74060a6429a19442317f948011cae59af6825808343 SHA512 9c5720b8694c235ca988ef45da1d564ac06e31c0a40600b32c0b9df399693e4eba296ca43b077ed97adba085362ddb0fb94e0d28232afc3e7351820b1285061f +DIST clang-tools-extra-6.0.1.src.tar.xz 757256 BLAKE2B 1d91d7459a34e7251007af91db1803ee6d04f1ef3e0fcf134a7e0d1d3456b094a80339ee60db3f0bdd12961f3a05caee7edfc5c6b9c48d49cd55a5dc3c102c3a SHA512 cf29d117b6dabcb7a8e5f6dab5016ce5a5c8f475679001a43fd5c935f2c368f37cdef50aae2080a1e4524f647f6d83458d4a5dec5b45d03fb374f463caf7c3f5 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d DIST llvm-5.0.1-manpages.tar.bz2 94004 BLAKE2B 34eb29361ad7aa881e64d1dd2992fd89ce44adafd2521284c27b6ffe7082bc7e70458204e6f34d582b704bf7c5dad93c6a6dc41fc7abc41862aab8f5ec53ed07 SHA512 3444cc8e06009f5dd2669b92af662a1049d9294c8ca0dcf45486e1dc1aaf10160860b7856d30ad70bbe5864b21d1539316e89f5237549f5653954e23baf64334 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb @@ -23,6 +25,8 @@ DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1 DIST llvm-6.0.0-manpages.tar.bz2 102668 BLAKE2B f458cbfcfdd6600f90f9bbe8cd9681de3dc11c62dbfcaa5ba7a281ad30d6367c33bebd5090c255e85a10b00b7bcb9c988d340b67f1db51982f55956acba109e9 SHA512 a7ed3e246e6488254f19dbb8484c079be39bc52f9b2fab3f736dd013683b7f46e8e036ee571dec5066c86ee7c25713608a2426555e8ad04b81891912314ee48e DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c +DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3 +DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415 EBUILD clang-3.4.2-r100.ebuild 972 BLAKE2B b11888e71750e7de7363d0e74a43999b31baf54dd43438c98d037b5b49d4043a74fdda70dd2b0eb405451c2579ee0285404b28792cc525c1c26e81a07bfd2dc9 SHA512 b42ec4379b4a70eb638ae6a6d45a287cd83f5ac339ac25ade2c6c77bd8d05c208d389d6f09e4cfe567e67d3e616adfbaffa1b1a9a7f35f5ecb7a0e7ccdc720fc EBUILD clang-3.5.2-r100.ebuild 972 BLAKE2B 0f17918969ee1034e1febc34afe95a29dddcf6056caa53920ade66a887b57939933f31b022fb68fb29bf8a5e387f659f6e3b618594cda4cd50f913ec14d0f0de SHA512 1e9a9f67ecd1cea111599376e676c665c6c1e731514a06065751502d221f8c6d7033dc23376f21850a63d036a33fbf241845a9127beca6ee8549348866cdce3e @@ -32,7 +36,8 @@ EBUILD clang-3.9.1-r100.ebuild 1471 BLAKE2B a3f8f43d3f07cc8598a4bdd8e0c59d1da652 EBUILD clang-4.0.1.ebuild 9614 BLAKE2B ba22e432cd595ecb6a4c13fd4a6de428242b13138f0f079826b4acfd37515c69776800cda3c6533338986bb0db75fa814905a3a4649ebf8812872e97ad1d5a9a SHA512 d533ebcc2d5cfc801d71f95414aa510a4d3143b55fc0917a899a863d19ad8618ba31db6991ad3b73db4959bb2b2e37ea9410e99d2d85cbb81348db1d3af1bf2e EBUILD clang-5.0.1.ebuild 10440 BLAKE2B 13bc01d728e98302c8f1708c805e5528fa5f924ac892f17a3f06684fc43448e8d97159f1b9361e633eaccf0717242c4778481f10bff92063256b3307bf7197ab SHA512 57b7dc557e5144d3cc9f7c7560ffaa51ca5af184031b01acb74fd565171d80bfd973f82c7406f8dc624d59f183f12aea8e925465e1059ce1f8a8ce2c2d2fdd94 EBUILD clang-5.0.2.ebuild 10447 BLAKE2B bd8bc12e08364171fdb3c1fb1bf98f4614a0adb6f5e5bfc590488b02b9da9412faaee773fbc331d1deab61e08f54bdd78ea2504eb1f837c07d2832b4f2d4e5ac SHA512 d6fa3371914a9da6bb2728500a5a1bd6846e310b126e5534fb634b4056851d24f88108a0ef40cca7202c4cf65416d48fd17b2caa2342e36397b308537db5b395 -EBUILD clang-6.0.0-r1.ebuild 10449 BLAKE2B c5723a9a32ff5e855f9645736323942836f3762abbb3fb063b1bcc2cb651a0613e29448d1cab6334abaf27b8b4f2432a1bef39195fa775837fd6adb15b4e7053 SHA512 fb0acd4fb403112c1097bb0dde46f30ce242a3fc0bd7c2514bd789a41f89eff73dd0cdb7f2c68bf75547dbc3126f7eceeb274d7ec2f5b6c4d386b4dcd9981325 +EBUILD clang-6.0.0-r1.ebuild 10449 BLAKE2B eea2678317340e5737c0032ef4e9d206bfcd5127da5c35533d376bf98fe89d793f1bfd3ac8aeabb42b3770fdc43955e8f474b35184739d48a092d893228641ae SHA512 4a2ceebd3412f11fab1b0ed60cf1d3cae63845f210530a92b15c1fcd848b5f386ff3baef594cf43b1236e3dadbff5d17df0ac422a0b5994ee47ff5bf8e0a9e99 +EBUILD clang-6.0.1.ebuild 10270 BLAKE2B b318494b031ca51f933a4c261cbbb7f9160f80aa8c8afb35a1ffff460c8f23202583c7b5f4e5039d34787fe4fdc0825f837e6b6e2f085cee0c210e041e31ef73 SHA512 1d0a7b19caea2ccd2d7846349f110d254eea33da8385e0e8e97212c05e6e14ff1ceba1e6291e3eb69a7f76ed6cf8067e36c96accd773991a017b6971c12a4188 EBUILD clang-6.0.9999.ebuild 9415 BLAKE2B c605173c0fbe72841bb6dd63c3f7823c8aeb170c6fdab53a6a0e3470595cd537ed9ad82187d54e2bf2f4d5a19857f509fc0c4cc26824cdc06069340538d7223f SHA512 aba7391f35fb3c47b4d6f447d69bd44c44658bd95171ea74924687a0daff1a1483a94a096e57131da86cbbf6642b513c3ad39d133f2a589e4b8e5b053d3e66a6 EBUILD clang-9999.ebuild 9487 BLAKE2B d8705c29b9a4e60608af3910a47e91d5a16cf531370b968511e96261207747cdf47981d2ab435a8c1e3ba4fda863248a299609ef2ae79c04aa2f6d68ad586daf SHA512 434bcd703b29bd9491368c0f665581cf3d2569743b311d6430031baf7943ed7d7c1dbd27b8c243c087a709bc0d4e04605648066a7d237888d78b2bd5df179e31 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932 diff --git a/sys-devel/clang/clang-6.0.0-r1.ebuild b/sys-devel/clang/clang-6.0.0-r1.ebuild index bbe27878acb5..f0aaf604df17 100644 --- a/sys-devel/clang/clang-6.0.0-r1.ebuild +++ b/sys-devel/clang/clang-6.0.0-r1.ebuild @@ -77,7 +77,7 @@ PATCHES=( "${FILESDIR}"/6.0.0/0001-Driver-Avoid-invalidated-iterator-in-insertTargetAnd.patch # fix test failure with default-compiler-rt # https://bugs.gentoo.org/650316 - "${FILESDIR}"/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch + "${FILESDIR}"/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch ) # Multilib notes: diff --git a/sys-devel/clang/clang-6.0.1.ebuild b/sys-devel/clang/clang-6.0.1.ebuild new file mode 100644 index 000000000000..d42ae48d2ea2 --- /dev/null +++ b/sys-devel/clang/clang-6.0.1.ebuild @@ -0,0 +1,322 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +: ${CMAKE_MAKEFILE_GENERATOR:=ninja} +# (needed due to CMAKE_BUILD_TYPE != Gentoo) +CMAKE_MIN_VERSION=3.7.0-r1 +PYTHON_COMPAT=( python2_7 ) + +inherit cmake-utils eapi7-ver flag-o-matic llvm \ + multilib-minimal multiprocessing pax-utils prefix python-single-r1 \ + toolchain-funcs + +MY_P=cfe-${PV/_/}.src +EXTRA_P=clang-tools-extra-${PV/_/}.src +LLVM_P=llvm-${PV/_/}.src + +DESCRIPTION="C language family frontend for LLVM" +HOMEPAGE="https://llvm.org/" +SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz + https://releases.llvm.org/${PV/_//}/${EXTRA_P}.tar.xz + test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz ) + !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )" + +# Keep in sync with sys-devel/llvm +ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 + NVPTX PowerPC Sparc SystemZ X86 XCore ) +ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) +LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} + +LICENSE="UoI-NCSA" +SLOT="$(ver_cut 1)" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer + test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}] + static-analyzer? ( + dev-lang/perl:* + z3? ( sci-mathematics/z3:0= ) + ) + xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) + ${PYTHON_DEPS}" +# configparser-3.2 breaks the build (3.3 or none at all are fine) +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx ) + xml? ( virtual/pkgconfig ) + !! clang-X.Y + # - clang++, clang-cl, clang-cpp -> clang + # we want to have: + # - clang-X.Y + # - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y + # - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y + # also in CHOST variant + for i in "${clang_tools[@]:1}"; do + rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die + dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}" + dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}" + done + + # now create target symlinks for all supported ABIs + for abi in $(get_all_abis); do + local abi_chost=$(get_abi_CHOST "${abi}") + for i in "${clang_tools[@]}"; do + dosym "${i}-${clang_version}" \ + "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}" + dosym "${abi_chost}-${i}-${clang_version}" \ + "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}" + done + done + + # Remove unnecessary headers on FreeBSD, bug #417171 + if use kernel_FreeBSD; then + rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die + fi +} + +multilib_src_install() { + cmake-utils_src_install + + # move headers to /usr/include for wrapping & ABI mismatch checks + # (also drop the version suffix from runtime headers) + rm -rf "${ED%/}"/usr/include || die + mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die + mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die +} + +multilib_src_install_all() { + python_fix_shebang "${ED}" + if use static-analyzer; then + python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view + fi + + # install pre-generated manpages + if ! use doc; then + insinto "/usr/lib/llvm/${SLOT}/share/man/man1" + doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1 + fi + + docompress "/usr/lib/llvm/${SLOT}/share/man" + # match 'html' non-compression + use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" + # +x for some reason; TODO: investigate + use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1" +} + +pkg_postinst() { + if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow update all + fi + + elog "You can find additional utility scripts in:" + elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/clang" + elog "To use these scripts, you will need Python 2.7. Some of them are vim" + elog "integration scripts (with instructions inside). The run-clang-tidy.py" + elog "scripts requires the following additional package:" + elog " dev-python/pyyaml" +} + +pkg_postrm() { + if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then + eselect compiler-shadow clean all + fi +} diff --git a/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch b/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch deleted file mode 100644 index 0c6644891069..000000000000 --- a/sys-devel/clang/files/6.0.0/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f81bc3f2d174ac21e576cdddb736524531258fbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Mon, 19 Mar 2018 20:55:47 +0100 -Subject: [PATCH 2/2] [test] Fix Cross-DSO CFI Android sanitizer test for - -rtlib=compiler-rt - -Fix the CHECK-CFI-CROSS-DSO-ANDROID test to be more precise and match -specifically 'clang_rt.cfi' rather than any compiler-rt library. This -fixes the failure when the linker command-line contains -clang_rt.builtins library due to CLANG_DEFAULT_RTLIB=compiler-rt. ---- - test/Driver/sanitizer-ld.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c -index 0da4255f69..9309450186 100644 ---- a/test/Driver/sanitizer-ld.c -+++ b/test/Driver/sanitizer-ld.c -@@ -514,7 +514,7 @@ - // RUN: --sysroot=%S/Inputs/basic_android_tree \ - // RUN: | FileCheck --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID %s - // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}" --// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt. -+// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.cfi - - // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime. - // RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso %s -### -o %t.o 2>&1 \ --- -2.16.2 - diff --git a/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch b/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch new file mode 100644 index 000000000000..0c6644891069 --- /dev/null +++ b/sys-devel/clang/files/6.0.1/0002-test-Fix-Cross-DSO-CFI-Android-sanitizer-test-for-rt.patch @@ -0,0 +1,30 @@ +From f81bc3f2d174ac21e576cdddb736524531258fbe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Mon, 19 Mar 2018 20:55:47 +0100 +Subject: [PATCH 2/2] [test] Fix Cross-DSO CFI Android sanitizer test for + -rtlib=compiler-rt + +Fix the CHECK-CFI-CROSS-DSO-ANDROID test to be more precise and match +specifically 'clang_rt.cfi' rather than any compiler-rt library. This +fixes the failure when the linker command-line contains +clang_rt.builtins library due to CLANG_DEFAULT_RTLIB=compiler-rt. +--- + test/Driver/sanitizer-ld.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/Driver/sanitizer-ld.c b/test/Driver/sanitizer-ld.c +index 0da4255f69..9309450186 100644 +--- a/test/Driver/sanitizer-ld.c ++++ b/test/Driver/sanitizer-ld.c +@@ -514,7 +514,7 @@ + // RUN: --sysroot=%S/Inputs/basic_android_tree \ + // RUN: | FileCheck --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID %s + // CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}" +-// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt. ++// CHECK-CFI-CROSS-DSO-ANDROID-NOT: libclang_rt.cfi + + // Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime. + // RUN: %clang -fsanitize=cfi -fsanitize-cfi-cross-dso %s -### -o %t.o 2>&1 \ +-- +2.16.2 + -- cgit v1.2.3