Add AddressSanitizer (asan) support with compiler-rt, bug #407295

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 21 insertions, 10 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index edff42ab6005..54fe580c0b41 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.56 2012/02/28 09:09:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.57 2012/03/08 16:37:54 voyageur Exp $
+
+  08 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> clang-9999.ebuild:
+  Add AddressSanitizer (asan) support with compiler-rt, bug #407295
 
   28 Feb 2012; Fabian Groffen <grobian@gentoo.org> clang-3.0-r3.ebuild,
   clang-9999.ebuild, files/clang-3.0-gentoo-binutils-apple.patch:
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 03dd67a9d590..47c07bf2ffac 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX clang-2.7-fixdoc.patch 1977 RMD160 62f52e5580baa396d93c56735c0039c8691b43b6 SHA1 351c1d2cf86b6da75a6ed19083d7a857333f007c SHA256 36c2214e575ed3fd78938279739e82c4f750f8726f8387e1414c18532501314a
 AUX clang-2.8-alignof.patch 11984 RMD160 3ddf038274481a325ced3a736a5109302d0c50b5 SHA1 7d040a7d2d54e64b85cd2ac188d151d8b89fc62a SHA256 2c1d648c64cc6582a00b0adbc5c65e3ac89a1bb1816e0691902866730a332fa2
@@ -20,13 +20,13 @@ DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SH
 EBUILD clang-2.8-r3.ebuild 6768 RMD160 7b552f45bca12124fe5659a9d3690b60706d14cb SHA1 c3b42800e461cda5852961f912e4ac0609062e0c SHA256 604b2964d566197adda982e6c1e6cdcc3365596ccfabadafe60e316049edabd7
 EBUILD clang-2.9-r1.ebuild 6431 RMD160 cb9ed182675f9a76beb2caa0fc1fe26bfc534dd9 SHA1 1a7a912396c7d1823cd1867bb4be9679a31b2c0e SHA256 f9993c92ea46a43debdf55563b70093530e1eabebcee270c01e4d0e3b9490d1a
 EBUILD clang-3.0-r3.ebuild 6615 RMD160 ec67ec4642539985134b6b7b11a2f232c2ef8771 SHA1 5357bc6235fe8785a6e0f1441a51a0b0759b9958 SHA256 8e05a18a8bd221a1f37968216ea98f7343fa225d115e1b38584d6734d81e88b0
-EBUILD clang-9999.ebuild 5085 RMD160 03c5541c8e32daa2b9ab735be0a23bb6c783a87f SHA1 2e1584af260e7a87c376e1bc2946ed8931c3bf37 SHA256 522ca2a78a20e1dd3f2f1ee55850caa36f3b0f35122c4d89ec984e8111128c14
-MISC ChangeLog 10844 RMD160 960fda86d6557a4244ac2514232e4cbbbdae47e1 SHA1 d40dc0690b2354b53c1a6dae7e6e9d7ae0861dba SHA256 2666f71fd3e89f83d51ec8d177f02efc70bf8d0e421a9a72e5678b8708ac93d3
+EBUILD clang-9999.ebuild 5527 RMD160 5b5fef14c06044410fc60b2f01060e9b21cb4fcf SHA1 a5145e30c5792d3350968ccc6e6340a6b602e32f SHA256 855f0d686bf3bd149e2b97bcde60008a3fd3bc000381b5d5ab4e5cceb32b6487
+MISC ChangeLog 10988 RMD160 f3d38f986ea85cb7738edb5b0231b512a6771c5a SHA1 e8a38275a4a42a729dc7fd4aaf0c889aef1a0080 SHA256 7f5c2b3d5538ce5ecb69ee6f3916e737f50f36691ebd8f8261aeec29e715a001
 MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9MmdEACgkQX3X2B8XHTondpQCgjW+847RV85+tvEBchXHH8KAy
-dEcAn1Ka/unPMgjzXF2Ajm8Ko5alRWO5
-=RW0E
+iF4EAREIAAYFAk9Y4HAACgkQFYEBGcdFJfJ39gD/Tyz79THhbCKeKp0PSqHC+YBf
+DMU9ftGaWPyxyDrg2sEBAKLKamD4RuAUcLAK5AngwbuC7qeF2JO+eD+MXH7zYRkf
+=Bf60
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index a180f27e0ba3..4378a8b7db3e 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.26 2012/02/28 09:09:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.27 2012/03/08 16:37:54 voyageur Exp $
 
 EAPI=4
 
@@ -25,8 +25,9 @@ RDEPEND="~sys-devel/llvm-${PV}[multitarget=]"
 S="${WORKDIR}/llvm"
 
 src_unpack() {
-	# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840
+	# Fetching LLVM and subprojects
 	ESVN_PROJECT=llvm subversion_fetch "http://llvm.org/svn/llvm-project/llvm/trunk"
+	ESVN_PROJECT=compiler-rt S="${S}"/projects/compiler-rt subversion_fetch "http://llvm.org/svn/llvm-project/compiler-rt/trunk"
 	ESVN_PROJECT=clang S="${S}"/tools/clang subversion_fetch
 }
 
@@ -38,6 +39,9 @@ src_prepare() {
 	sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \
 		-i tools/clang/lib/Headers/Makefile \
 		|| die "clang Makefile failed"
+	sed -e "/PROJ_resources/s#lib/clang#$(get_libdir)/clang#" \
+		-i tools/clang/runtime/compiler-rt/Makefile \
+		|| die "compiler-rt Makefile failed"
 	# fix the static analyzer for in-tree install
 	sed -e 's/import ScanView/from clang \0/'  \
 		-i tools/clang/tools/scan-view/scan-view \
@@ -51,6 +55,7 @@ src_prepare() {
 		|| die "gold plugin path sed failed"
 	# Specify python version
 	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
+	python_convert_shebangs 2 projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
 
 	# From llvm src_prepare
 	einfo "Fixing install dirs"
@@ -135,6 +140,9 @@ src_install() {
 		python_execute_function install-scan-view
 	fi
 
+	# AddressSanitizer symbolizer (currently separate)
+	dobin "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+
 	# Fix install_names on Darwin.  The build system is too complicated
 	# to just fix this, so we correct it post-install
 	if [[ ${CHOST} == *-darwin* ]] ; then