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 AEEB11382C5 for ; Fri, 4 Dec 2020 15:11:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5B4DE09B5; Fri, 4 Dec 2020 15:11:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 C9104E09B5 for ; Fri, 4 Dec 2020 15:11:47 +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 65C91340D50 for ; Fri, 4 Dec 2020 15:11:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C68AB476 for ; Fri, 4 Dec 2020 15:11:44 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1607094701.375f3579a115a14ddbd99aae0302da4d1dec4fea.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/gdb/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/gdb/gdb-10.1.ebuild sys-devel/gdb/gdb-9999.ebuild X-VCS-Directories: sys-devel/gdb/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 375f3579a115a14ddbd99aae0302da4d1dec4fea X-VCS-Branch: master Date: Fri, 4 Dec 2020 15:11:44 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f390707e-6b15-471e-abb8-6dc7561b58d3 X-Archives-Hash: aced3cff0cbdc352b1b2fd0924d859d5 commit: 375f3579a115a14ddbd99aae0302da4d1dec4fea Author: Fabian Groffen gentoo org> AuthorDate: Fri Dec 4 15:11:24 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Dec 4 15:11:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=375f3579 sys-devel/gdb-10.1: fix compilation on Solaris - refrain from linking against ancient libtermcap - really use auto-detection on gdbserver with USE=server Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> sys-devel/gdb/gdb-10.1.ebuild | 13 +++++++++---- sys-devel/gdb/gdb-9999.ebuild | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild index 410498d1061..6d2efc19161 100644 --- a/sys-devel/gdb/gdb-10.1.ebuild +++ b/sys-devel/gdb/gdb-10.1.ebuild @@ -99,6 +99,10 @@ src_prepare() { strip-linguas -u bfd/po opcodes/po export CC_FOR_BUILD=$(tc-getBUILD_CC) + + # avoid using ancient termcap from host on Prefix systems + sed -i -e 's/termcap tinfow/tinfow/g' \ + gdb/configure{.ac,} || die } gdb_branding() { @@ -141,10 +145,11 @@ src_configure() { # gdbserver only works for native targets (CHOST==CTARGET). # it also doesn't support all targets, so rather than duplicate # the target list (which changes between versions), use the - # "auto" value when things are turned on. - is_cross \ - && myconf+=( --disable-gdbserver ) \ - || myconf+=( $(use_enable server gdbserver auto) ) + # "auto" value when things are turned on, which is triggered + # whenever no --enable or --disable is given + if is_cross || use !server ; then + myconf+=( --disable-gdbserver ) + fi fi if ! ( use server && ! use client ) ; then diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index 44bd11b3926..1645237331c 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -99,6 +99,10 @@ src_prepare() { strip-linguas -u bfd/po opcodes/po export CC_FOR_BUILD=$(tc-getBUILD_CC) + + # avoid using ancient termcap from host on Prefix systems + sed -i -e 's/termcap tinfow/tinfow/g' \ + gdb/configure{.ac,} || die } gdb_branding() { @@ -141,10 +145,11 @@ src_configure() { # gdbserver only works for native targets (CHOST==CTARGET). # it also doesn't support all targets, so rather than duplicate # the target list (which changes between versions), use the - # "auto" value when things are turned on. - is_cross \ - && myconf+=( --disable-gdbserver ) \ - || myconf+=( $(use_enable server gdbserver auto) ) + # "auto" value when things are turned on, which is triggered + # whenever no --enable or --disable is given + if is_cross || use !server ; then + myconf+=( --disable-gdbserver ) + fi fi if ! ( use server && ! use client ) ; then