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 AB715158086 for ; Wed, 20 Oct 2021 01:51:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7BF38E083D; Wed, 20 Oct 2021 01:51:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61A87E083D for ; Wed, 20 Oct 2021 01:51:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1B884343970 for ; Wed, 20 Oct 2021 01:51:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65D4915F for ; Wed, 20 Oct 2021 01:51:31 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1634694349.b4afce4f330a0ea9eded0dda8dbba28da040b321.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/kbuild/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/kbuild/kbuild-0.1.9998.3499.ebuild dev-util/kbuild/kbuild-9999.ebuild X-VCS-Directories: dev-util/kbuild/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b4afce4f330a0ea9eded0dda8dbba28da040b321 X-VCS-Branch: master Date: Wed, 20 Oct 2021 01:51:31 +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: eb9b5342-617d-40d3-9c26-c79c10dfac6e X-Archives-Hash: e7ac49a15320ea2e05feaff268d66adc commit: b4afce4f330a0ea9eded0dda8dbba28da040b321 Author: Sam James gentoo org> AuthorDate: Sat Oct 9 05:03:32 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 20 01:45:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4afce4f dev-util/kbuild: workaround build failure with Bison 3.7 Force usage of either byacc or yacc or older-not-in-tree Bison (< 3.7); it's not enough to just depend on these because we can't really be sure what kbuild will try to use, especially if a newer Bison is installed (it'll just try to use it and die). We choose byacc > yacc > older Bison but allow the user to override it via the environment if they wish. Right now, manual intervention seems to be required for people to install this if, as is likely, users have modern Bison installed (they'd need to unmerge (ugh!) Bison and then install byacc or yacc & hope the build system picks it up). Bug: https://bugs.gentoo.org/734354 Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22522 Signed-off-by: Sam James gentoo.org> dev-util/kbuild/kbuild-0.1.9998.3499.ebuild | 21 ++++++++++++++++++++- dev-util/kbuild/kbuild-9999.ebuild | 22 ++++++++++++++++++++-- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild index 574abc5324a..1679cabf9a2 100644 --- a/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild +++ b/dev-util/kbuild/kbuild-0.1.9998.3499.ebuild @@ -65,7 +65,26 @@ src_prepare() { } src_compile() { - kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \ + if [[ -z ${YACC} ]] ; then + # If the user hasn't picked one, let's prefer byacc > yacc > old bison for now. + # See bug #734354 - bison doesn't work here. + # We can remove this once Bison works again! + if has_version "dev-util/byacc" ; then + export YACC=byacc + elif has_version "dev-util/yacc" ; then + export YACC=yacc + elif has_version " yacc > old bison for now. + # See bug #734354 - bison doesn't work here. + # We can remove this once Bison works again! + if has_version "dev-util/byacc" ; then + export YACC=byacc + elif has_version "dev-util/yacc" ; then + export YACC=yacc + elif has_version "