Add initial support for lldb debugger, bug #464354. Also enable USE=doc by default for live ebuild, useful if you want the man pages

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

4 files changed, 63 insertions, 23 deletions

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 76304464a81c..bc9fd4f032ef 100644
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.251 2015/06/14 17:56:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.252 2015/06/15 12:52:14 voyageur Exp $
+
+  15 Jun 2015; Bernard Cafarelli <voyageur@gentoo.org> llvm-9999.ebuild,
+  metadata.xml:
+  Add initial support for lldb debugger, bug #464354. Also enable USE=doc by
+  default for live ebuild, useful if you want the man pages
 
   14 Jun 2015; Michał Górny <mgorny@gentoo.org>
   +files/clang-3.6-fbsd-gcc49.patch, llvm-3.6.1.ebuild:
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 02201feaf353..314093c821de 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -100,25 +100,25 @@ EBUILD llvm-3.5.1.ebuild 15323 SHA256 3b673170e10b2cbad34d877eeaa870f7d26d777b85
 EBUILD llvm-3.5.2.ebuild 15351 SHA256 d06513e37ce4a492610840c9788aaeaf86fc184ca7ba6d7f9d897a5a1fc3aa03 SHA512 874c560af1c62c54401bcae868973b47576115951e353c1f324b88465ec8b19e1f549c8e8927bae6f3fd65a458f76d5903afd385de059724998a881e18b06d84 WHIRLPOOL a2fe4a0bef21d1be6e9a0e77e364c60af28ec5cff6f5429b40d1b821e462ca36a8a099cc7230e195253b77bc1871bd523f4f3e70cffa17ea3c318766fbf7879a
 EBUILD llvm-3.6.0.ebuild 15310 SHA256 213f00e1aeb57bed52823f43025c63a820a0aa92421de7ec2d539d61bb212577 SHA512 13be6ca07c5c90dd28656261b4585aa3810ab86024949d5865892bbd58508d9f77eab390aa5a5288c84aa3e2ce8d0ed5aeb9b2b84f28a77fb22b1dc5abf24d44 WHIRLPOOL 0b3f9778f8d3ca8417e7943ad49c236446de927ddcb80bd5b5fb62fc6accd63663666db716104dd6eb27552f288999a7191842b6fc0c4ccb9d810152b78f4659
 EBUILD llvm-3.6.1.ebuild 15577 SHA256 de3d8f200d292b83a5cff246bf03f62a83a4eee0f9e3ccafc59bd68d6694816c SHA512 120017895024f5b0e6d7c1f63b870f82c5ba1571e84fd9f3118ea0d38134b88714354e61e7f27c02171c16df28ee8275eee4682ead8a388d8d38f0c6163ff4cb WHIRLPOOL 872dbdb3948e4358dd0cd769686aab67194beb0de9d8205107be32d18fc22a19b6d8f926f6e971d1c1f342ff0c430e0298930b8a96f50e30df03811e028cb398
-EBUILD llvm-9999.ebuild 12570 SHA256 15ccc3fbfa05a19bb970cee935ec723d5e0510718cfff0b530c43a378c7de291 SHA512 b1ea1b63209c93baa57eb123844010fc18e4e32edaaf62cec8654c3627bbe53d22308e329b3d2d195b2e2e7fbc2dbc5dcdcfa49a23f7eb4a6f8695f42c6effc7 WHIRLPOOL 4e11d0598ad531ca5a2e646fc2441af137d5621471f5b137f12acbd546e37a6b25430061c0f9a232d815f3713fc61956ec8a6c66968b29328e7a13e6db15a4d9
-MISC ChangeLog 42592 SHA256 defc79edb6a49d7b86c26f9745d1a46fd5af6129f658e29e856390775a4c9724 SHA512 57cda8db2586799ef4803acbbe482c19386020472aac22e3d580f9accaa809fa14eec354621670d3f9eb956f3b81091e8d465da0aa1b841fb2f24d7df6e8ae2d WHIRLPOOL be973e8740c9f6d4edcefe829c8cad4a827fe2b5efced206732f39031be5aa35b9147dcfc7629c7ece1d2f09c30c848a655dd013b636f9f4d8b41c8773062c98
-MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
+EBUILD llvm-9999.ebuild 13391 SHA256 e18acb16affbd0df41b7d718b5973a59d156a5a5c7e848434918eaefe2b4117f SHA512 9116646b92de496e517064c44706cec04e107fa0865dc3792b5693230d1b5e5b38b7a78467082d1ea97dd62e43ef029d615a61bae424f08e664ade6812149ac7 WHIRLPOOL 772317e0df5ea93f91cff73cfbb2cf45a00d74c6ed488176eb7daef5667ecc042cb8abcf0ae9f1f7719f1ae8012b43d520281ac36b97462d690acfd4fab4204c
+MISC ChangeLog 42821 SHA256 564dc5c3ab78a0006f33c34c918e6b34a27222df2e2c1fa598b778974f267e43 SHA512 7c6d05e645d59ce00297f7444044cdc8058f75a6d609a6c9a762ccd6fc839b74d4edbfad7b4741fcab8d81e036c8589ad78df2d473598a082617f4382bf6ba2f WHIRLPOOL 3197dab225dff0bad2de880a152b0603b9027ab7c620901f247ed628999d913f5df3f1a0c0f168d7b18de277bbe5435576bd9654a90bc1ac984c8cd2faf8e7f5
+MISC metadata.xml 2838 SHA256 076a9036753eb54fa6d22a33cff2ff41f46a3ab8b2aca9fc850441041f5d9c16 SHA512 1a6501e86fd0be47c283d6aad622b2d6b00f581b7a6ef71843877eb1b4296e811336d498181a788dfe6be7f0b97100b22efa6a5d625ffea7c17e8e38c1ea97ac WHIRLPOOL 0d99795d232fe1dc7a493f2f3252d7b419f92422d9e4232ab0c87bbfc1ecca0c88e860c0f9f0a22a155a0becf7705d70caf73d176c6e3a4c48f9cd0d3143b0de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVfcA4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9OAQAI2qAp+Vq0HMZ/9bsBMgDKAT
-2TVUq2W8i5E0jtq3hZAWJbg3NFtOPYQ7XyLJ9/2oePRNqiYrEjOvCFVeE6wxs0zq
-CP/DLu6qH/TNHOz2w6VzuAD8h7Q1jZQetYcodiBSktsJ9mMsnMkaV+EF45HWMz2z
-CafJhbCNJx13Ibg4Gi+1gxZHXdOavL0zbLlZdW8fOUxaNOV12vP9SV47TjY8TQZf
-m16BSTtoNJ2tuYojV482UEklAnwArBOd1KCxxjcxDU/zs+t2jejm+eAnau1pjtmP
-nWo/kcrRQtdDU9zZlzAiQ+w2sq35Xu6kpPaQrJHYCm70PBCk0KdmA8QBbuBT4ynz
-EJoop2DtcjyKGV36A/CBbmnc6bOIbxpq0G2ic1z6ff0NIU78t+K5cB0VKfJ8Bgm2
-6wiS3Oul0UbHuIMVj7/wMZBVVEXNFUXeI651nHZaMHuifLpqYqNs97U1Pg5R5WbF
-JbO223ZEJZW07ywPljRxHJMstcA9013nQaGWo+sYKzfOgLC2W6kSxK9+gVB01Ab+
-GNLkTvNgBfM5wq2zGKArCENWo8fKaCOAYwJYgVMRHPjq0DYpqRWjqGwiPGhA17vV
-ActF3UHoM/kWaAwOcXDQ/uB+sRjwzWEgs/Isab4ipDSI8ZbD2WjGntVjENCTl56m
-TiTtrpfxqfu9byFJS/uy
-=PdjM
+iQJ8BAEBCABmBQJVfsp/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREMzFDRDFGNEQwRTAyNjc2QzRDNjRFQzAw
+MEY3QUIzMzFCMEYwOTdGAAoJEAD3qzMbDwl/7LcQANZYF3fx07q9lv0jcMTp/4go
+QmGndvlzd0RZcUmDPRi+rWUxQecRl3gckuopXZJchsrUNh0/PfnuoI7fEoz2twRU
+B/XL4lTBFHNFZHgAYABClZG67T4ePGzcJrXwhV4jHrIQbi8LfpbprMRvzqT0yaWX
+HakWRKDJ7jwGHWs1gF+ZkL3h7561hw/7t+xMA94Jy2F9J0yKVcz//vyZ7pn1zn7C
+b8uTG5ey7Z2dxD83lIssfMnkGUWxe7HgX9k00ZW6mu3zdRBnYCE80sM0dn2sE5bh
+DEEvIoDKG8c+nt0pK8wil1xBZnkb//5eyDALoPsEM9gXNEJowcsblTS5TgVprDPu
+MI/RKsJ8KXx7Ful5NJjTK65HMofc8Va0pBrt53iijnAxTs99O95QAyg7xUZeYMHQ
+WF5pWbec90hPvVjmbZmHHZIwEp3EezW0e4muGCEsTXPr5mDhI24rsnvLqkpLt+Gl
+kfiIZ/woS9rMb/kHxphIO22VLQC5xgDHOSJP8rpoAfLvR3FnI64yw8NjocwW3tet
+BOOvHqAlzSX9s23ps7Dd/AKPka2KHJgc/iBGXeVlu7N5nJOp/WnrDlHSuo4xzMYG
+it6lI8327aUBSojvQuQXYhkXSv2Xukpcpdxqx3RoBtiyquIF+NIZhQCaMk1Jozcu
+nG4rLIdURc3FxUk6PgkG
+=U1zS
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index b98537eda435..bf78b0036e36 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.116 2015/06/13 20:51:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.117 2015/06/15 12:52:14 voyageur Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ EGIT_REPO_URI="http://llvm.org/git/llvm.git
 LICENSE="UoI-NCSA"
 SLOT="0/${PV}"
 KEYWORDS=""
-IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml
+IUSE="clang debug +doc gold libedit +libffi lldb multitarget ncurses ocaml
 	python +static-analyzer test xml video_cards_radeon kernel_Darwin"
 
 COMMON_DEPEND="
@@ -54,6 +54,7 @@ DEPEND="${COMMON_DEPEND}
 	clang? ( xml? ( virtual/pkgconfig ) )
 	doc? ( dev-python/sphinx )
 	libffi? ( virtual/pkgconfig )
+	lldb? ( dev-lang/swig )
 	!!<dev-python/configparser-3.3.0.2
 	${PYTHON_DEPS}"
 RDEPEND="${COMMON_DEPEND}
@@ -65,7 +66,8 @@ PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
 # pypy gives me around 1700 unresolved tests due to open file limit
 # being exceeded. probably GC does not close them fast enough.
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( || ( $(python_gen_useflags 'python*') ) )"
+	test? ( || ( $(python_gen_useflags 'python*') ) )
+	lldb? ( clang )"
 
 pkg_pretend() {
 	# in megs
@@ -128,6 +130,10 @@ src_unpack() {
 		git-r3_fetch "http://llvm.org/git/clang-tools-extra.git
 			https://github.com/llvm-mirror/clang-tools-extra.git"
 	fi
+	if use lldb; then
+		git-r3_fetch "http://llvm.org/git/lldb.git
+			https://github.com/llvm-mirror/lldb.git"
+	fi
 	git-r3_fetch
 
 	if use clang; then
@@ -138,6 +144,10 @@ src_unpack() {
 		git-r3_checkout http://llvm.org/git/clang-tools-extra.git \
 			"${S}"/tools/clang/tools/extra
 	fi
+	if use lldb; then
+		git-r3_checkout http://llvm.org/git/lldb.git \
+			"${S}"/tools/lldb
+	fi
 	git-r3_checkout
 }
 
@@ -178,6 +188,13 @@ src_prepare() {
 		epatch "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 	fi
 
+	if use lldb; then
+		# Do not install dummy readline.so module from
+		# https://llvm.org/bugs/show_bug.cgi?id=18841
+		sed -e 's/add_subdirectory(readline)/#&/' \
+			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
+	fi
+
 	# User patches
 	epatch_user
 
@@ -226,6 +243,10 @@ multilib_src_configure() {
 		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
 
 		-DHAVE_HISTEDIT_H=$(usex libedit)
+
+		-DLLDB_DISABLE_LIBEDIT=$(usex libedit 0 1)
+		-DLLDB_DISABLE_CURSES=$(usex libedit 0 1)
+		-DLLDB_ENABLE_TERMINFO=$(usex ncurses)
 	)
 
 	if ! multilib_is_native_abi || ! use ocaml; then
@@ -260,6 +281,13 @@ multilib_src_configure() {
 				-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
 			)
 		fi
+
+		if use lldb; then
+			mycmakeargs+=(
+				-DLLDB_DISABLE_PYTHON=$(usex python 0 1)
+			)
+		fi
+
 	else
 		if use clang; then
 			mycmakeargs+=(
@@ -271,6 +299,12 @@ multilib_src_configure() {
 				-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
 			)
 		fi
+		if use lldb; then
+			mycmakeargs+=(
+				# only run swig on native abi
+				-DLLDB_DISABLE_PYTHON=ON
+			)
+		fi
 	fi
 
 	if use clang; then
diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index 1a630669f376..c0b2ba7acaf6 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -19,6 +19,7 @@
 		<flag name='cmake'>Enable cmake support (experimental)</flag>
 		<flag name='doc'>Build and install the HTML documentation and regenerate the man pages</flag>
 		<flag name='gold'>Build the gold linker plugin</flag>
+		<flag name='lldb'>Build the lldb debugger</flag>
 		<flag name='llvm-gcc'>Build LLVM with <pkg>sys-devel/llvm-gcc</pkg></flag>
 		<flag name='multitarget'>Build all host targets (default: host only)</flag>
 		<flag name='ncurses'>Support querying terminal properties using ncurses' terminfo</flag>