From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2C352138206 for ; Fri, 19 Jan 2018 22:22:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83177E095E; Fri, 19 Jan 2018 22:21:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51FEBE095E for ; Fri, 19 Jan 2018 22:21:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD600335C2E for ; Fri, 19 Jan 2018 22:21:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04DA31C1 for ; Fri, 19 Jan 2018 22:21:56 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1516400504.70f3c921f0256c2443e123b57f82b5e3af8fdbf6.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/lldb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/lldb/lldb-5.0.1.ebuild dev-util/lldb/lldb-6.0.9999.ebuild dev-util/lldb/lldb-9999.ebuild X-VCS-Directories: dev-util/lldb/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 70f3c921f0256c2443e123b57f82b5e3af8fdbf6 X-VCS-Branch: master Date: Fri, 19 Jan 2018 22:21:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 44da614c-09de-45ac-bc08-bb6f5449efa2 X-Archives-Hash: 261448dc1654976d78eac499915abcc7 commit: 70f3c921f0256c2443e123b57f82b5e3af8fdbf6 Author: Michał Górny gentoo org> AuthorDate: Fri Jan 19 19:54:55 2018 +0000 Commit: Michał Górny gentoo 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