commit: 70f3c921f0256c2443e123b57f82b5e3af8fdbf6 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Jan 19 19:54:55 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Jan 19 22:21:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f3c921
dev-util/lldb: Utilize LLDB_USE_SYSTEM_SIX Use LLDB_USE_SYSTEM_SIX to disable installing the bundled six module instead of removing it manually. Closes: https://bugs.gentoo.org/645042 dev-util/lldb/lldb-5.0.1.ebuild | 6 ++---- dev-util/lldb/lldb-6.0.9999.ebuild | 4 +--- dev-util/lldb/lldb-9999.ebuild | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dev-util/lldb/lldb-5.0.1.ebuild b/dev-util/lldb/lldb-5.0.1.ebuild index 3b256444479..899fe2be5ae 100644 --- a/dev-util/lldb/lldb-5.0.1.ebuild +++ b/dev-util/lldb/lldb-5.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -67,6 +67,7 @@ src_configure() { -DLLDB_DISABLE_CURSES=$(usex !ncurses) -DLLDB_DISABLE_LIBEDIT=$(usex !libedit) -DLLDB_DISABLE_PYTHON=$(usex !python) + -DLLDB_USE_SYSTEM_SIX=1 -DLLVM_ENABLE_TERMINFO=$(usex ncurses) -DLLVM_BUILD_TESTS=$(usex test) @@ -104,9 +105,6 @@ src_install() { # oh my... if use python; then - # remove bundled six module - rm "${D}$(python_get_sitedir)/six.py" || die - # remove custom readline.so for now # TODO: figure out how to deal with it # upstream is basically building a custom readline.so with -ledit diff --git a/dev-util/lldb/lldb-6.0.9999.ebuild b/dev-util/lldb/lldb-6.0.9999.ebuild index 2fb31177cc4..cf7c78750f2 100644 --- a/dev-util/lldb/lldb-6.0.9999.ebuild +++ b/dev-util/lldb/lldb-6.0.9999.ebuild @@ -68,6 +68,7 @@ src_configure() { -DLLDB_DISABLE_CURSES=$(usex !ncurses) -DLLDB_DISABLE_LIBEDIT=$(usex !libedit) -DLLDB_DISABLE_PYTHON=$(usex !python) + -DLLDB_USE_SYSTEM_SIX=1 -DLLVM_ENABLE_TERMINFO=$(usex ncurses) -DLLDB_INCLUDE_TESTS=$(usex test) @@ -106,9 +107,6 @@ src_install() { # oh my... if use python; then - # remove bundled six module - rm "${D}$(python_get_sitedir)/six.py" || die - # remove custom readline.so for now # TODO: figure out how to deal with it # upstream is basically building a custom readline.so with -ledit diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild index 405a88ed3c3..7e422adecfd 100644 --- a/dev-util/lldb/lldb-9999.ebuild +++ b/dev-util/lldb/lldb-9999.ebuild @@ -67,6 +67,7 @@ src_configure() { -DLLDB_DISABLE_CURSES=$(usex !ncurses) -DLLDB_DISABLE_LIBEDIT=$(usex !libedit) -DLLDB_DISABLE_PYTHON=$(usex !python) + -DLLDB_USE_SYSTEM_SIX=1 -DLLVM_ENABLE_TERMINFO=$(usex ncurses) -DLLDB_INCLUDE_TESTS=$(usex test) @@ -105,9 +106,6 @@ src_install() { # oh my... if use python; then - # remove bundled six module - rm "${D}$(python_get_sitedir)/six.py" || die - # remove custom readline.so for now # TODO: figure out how to deal with it # upstream is basically building a custom readline.so with -ledit
