voyageur 15/06/15 12:52:14 Modified: metadata.xml ChangeLog llvm-9999.ebuild Log: Add initial support for lldb debugger, bug #464354. Also enable USE=doc by default for live ebuild, useful if you want the man pages (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 00F7AB331B0F097F)
Revision Changes Path 1.15 sys-devel/llvm/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/metadata.xml?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/metadata.xml?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/metadata.xml?r1=1.14&r2=1.15 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/metadata.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- metadata.xml 18 Feb 2015 15:08:43 -0000 1.14 +++ metadata.xml 15 Jun 2015 12:52:14 -0000 1.15 @@ -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> 1.252 sys-devel/llvm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.252&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?rev=1.252&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/ChangeLog?r1=1.251&r2=1.252 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- ChangeLog 14 Jun 2015 17:56:07 -0000 1.251 +++ ChangeLog 15 Jun 2015 12:52:14 -0000 1.252 @@ -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 <[email protected]> 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 <[email protected]> +files/clang-3.6-fbsd-gcc49.patch, llvm-3.6.1.ebuild: 1.117 sys-devel/llvm/llvm-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.117&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?rev=1.117&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild?r1=1.116&r2=1.117 Index: llvm-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- llvm-9999.ebuild 13 Jun 2015 20:51:45 -0000 1.116 +++ llvm-9999.ebuild 15 Jun 2015 12:52:14 -0000 1.117 @@ -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 @@ 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 @@ 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 @@ # 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 @@ 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 @@ 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 @@ 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 @@ -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 @@ -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 @@ -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
