From owner-svn-src-head@freebsd.org Thu Jul 9 03:28:31 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61F2C35E104; Thu, 9 Jul 2020 03:28:31 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2M8G35WGz4R29; Thu, 9 Jul 2020 03:28:29 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.125.17]) by shaw.ca with ESMTPA id tNEXjFDsyYYpxtNEZj8Vxa; Wed, 08 Jul 2020 21:28:28 -0600 X-Authority-Analysis: v=2.3 cv=OubUNx3t c=1 sm=1 tr=0 a=VFtTW3WuZNDh6VkGe7fA3g==:117 a=VFtTW3WuZNDh6VkGe7fA3g==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=_RQrkK6FrEwA:10 a=6I5d2MoRAAAA:8 a=_ctWjzdLAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=ivertL0OXLirZ6vrQHoA:9 a=gX0obxj2ZQlfiga1:21 a=Btts8oRErTxtH1W5:21 a=zzhV4YzyAdNZmCBt:21 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=WoGCsytTnHKj16XvecxK:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id CDFD21C5; Wed, 8 Jul 2020 20:28:24 -0700 (PDT) Received: from slippy.cwsent.com (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id 0693SNC4028245; Wed, 8 Jul 2020 20:28:23 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Received: from slippy (cy@localhost) by slippy.cwsent.com (8.15.2/8.15.2/Submit) with ESMTP id 0693SNo4028242; Wed, 8 Jul 2020 20:28:23 -0700 (PDT) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202007090328.0693SNo4028242@slippy.cwsent.com> X-Authentication-Warning: slippy.cwsent.com: cy owned process doing -bs X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: "Simon J. Gerraty" cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r363031 - in head: contrib/bmake contrib/bmake/lst.lib contrib/bmake/mk contrib/bmake/mk/sys contrib/bmake/unit-tests usr.bin/bmake In-reply-to: <202007082120.068LKCeN067904@repo.freebsd.org> References: <202007082120.068LKCeN067904@repo.freebsd.org> Comments: In-reply-to "Simon J. Gerraty" message dated "Wed, 08 Jul 2020 21:20:12 -0000." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 08 Jul 2020 20:28:23 -0700 X-CMAE-Envelope: MS4wfAr2uIADS2VI8NBlMinPG5LriOuNG8EfTCwj3/t/CLhcVjLa3OrMNNW+ALEizpT1govXEM1nYrRNHRtijM2DBKkM9wEnk/uzz/QngYKJCsnsbHWrv8xK FjgJ8W/mh53eY/7yfS//c4t0/qNZrcA3DscrksoZDcU+MuwH5/U7a/IaQg7TQQByHJNAlgxt4r/+UCYOQun6IOLjqMuaElHwUKsnHO/Z8WLQQmOmld0GxFNA FN08yKkyKBC1A1kar8vFzenw4L2zn6kxPLU2kuMajJLoaCoMO/5/gm0L4PW8fJ+E X-Rspamd-Queue-Id: 4B2M8G35WGz4R29 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jul 2020 03:28:31 -0000 In message <202007082120.068LKCeN067904@repo.freebsd.org>, "Simon J. Gerraty" w rites: > Author: sjg > Date: Wed Jul 8 21:20:12 2020 > New Revision: 363031 > URL: https://svnweb.freebsd.org/changeset/base/363031 > > Log: > Update to bmake-20200704 > > Key changes include reduced noise at end of failed build log > and avoid evaluation of unnecessary terms in conditionals. > > MFC after: 1 week > > Added: > head/contrib/bmake/LICENSE > - copied unchanged from r363019, vendor/NetBSD/bmake/dist/LICENSE > head/contrib/bmake/unit-tests/cond-short.exp > - copied unchanged from r363019, vendor/NetBSD/bmake/dist/unit-tests/con > d-short.exp > head/contrib/bmake/unit-tests/cond-short.mk > - copied unchanged from r363019, vendor/NetBSD/bmake/dist/unit-tests/con > d-short.mk > Modified: > head/contrib/bmake/ChangeLog > head/contrib/bmake/FILES > head/contrib/bmake/VERSION > head/contrib/bmake/arch.c > head/contrib/bmake/buf.c > head/contrib/bmake/compat.c > head/contrib/bmake/cond.c > head/contrib/bmake/dir.c > head/contrib/bmake/for.c > head/contrib/bmake/hash.c > head/contrib/bmake/hash.h > head/contrib/bmake/job.c > head/contrib/bmake/job.h > head/contrib/bmake/lst.lib/lstAppend.c > head/contrib/bmake/lst.lib/lstAtEnd.c > head/contrib/bmake/lst.lib/lstAtFront.c > head/contrib/bmake/lst.lib/lstClose.c > head/contrib/bmake/lst.lib/lstConcat.c > head/contrib/bmake/lst.lib/lstDatum.c > head/contrib/bmake/lst.lib/lstDeQueue.c > head/contrib/bmake/lst.lib/lstDupl.c > head/contrib/bmake/lst.lib/lstEnQueue.c > head/contrib/bmake/lst.lib/lstFind.c > head/contrib/bmake/lst.lib/lstFindFrom.c > head/contrib/bmake/lst.lib/lstFirst.c > head/contrib/bmake/lst.lib/lstForEach.c > head/contrib/bmake/lst.lib/lstForEachFrom.c > head/contrib/bmake/lst.lib/lstInit.c > head/contrib/bmake/lst.lib/lstInsert.c > head/contrib/bmake/lst.lib/lstIsAtEnd.c > head/contrib/bmake/lst.lib/lstIsEmpty.c > head/contrib/bmake/lst.lib/lstLast.c > head/contrib/bmake/lst.lib/lstNext.c > head/contrib/bmake/lst.lib/lstOpen.c > head/contrib/bmake/lst.lib/lstPrev.c > head/contrib/bmake/lst.lib/lstRemove.c > head/contrib/bmake/lst.lib/lstReplace.c > head/contrib/bmake/lst.lib/lstSucc.c > head/contrib/bmake/main.c > head/contrib/bmake/make.c > head/contrib/bmake/make.h > head/contrib/bmake/make_malloc.c > head/contrib/bmake/meta.c > head/contrib/bmake/meta.h > head/contrib/bmake/mk/ChangeLog > head/contrib/bmake/mk/FILES > head/contrib/bmake/mk/gendirdeps.mk > head/contrib/bmake/mk/install-mk > head/contrib/bmake/mk/mkopt.sh > head/contrib/bmake/mk/sys/AIX.mk > head/contrib/bmake/mk/sys/Darwin.mk > head/contrib/bmake/mk/sys/Generic.mk > head/contrib/bmake/mk/sys/HP-UX.mk > head/contrib/bmake/mk/sys/IRIX.mk > head/contrib/bmake/mk/sys/Linux.mk > head/contrib/bmake/mk/sys/NetBSD.mk > head/contrib/bmake/mk/sys/OSF1.mk > head/contrib/bmake/mk/sys/OpenBSD.mk > head/contrib/bmake/mk/sys/SunOS.mk > head/contrib/bmake/mk/sys/UnixWare.mk > head/contrib/bmake/nonints.h > head/contrib/bmake/parse.c > head/contrib/bmake/str.c > head/contrib/bmake/suff.c > head/contrib/bmake/targ.c > head/contrib/bmake/trace.c > head/contrib/bmake/unit-tests/Makefile > head/contrib/bmake/unit-tests/modmatch.mk > head/contrib/bmake/unit-tests/modmisc.exp > head/contrib/bmake/unit-tests/modmisc.mk > head/contrib/bmake/unit-tests/modorder.exp > head/contrib/bmake/unit-tests/modorder.mk > head/contrib/bmake/unit-tests/sysv.exp > head/contrib/bmake/unit-tests/sysv.mk > head/contrib/bmake/unit-tests/varmisc.exp > head/contrib/bmake/unit-tests/varmisc.mk > head/contrib/bmake/util.c > head/contrib/bmake/var.c > head/usr.bin/bmake/Makefile.config > Directory Properties: > head/contrib/bmake/ (props changed) > This broke ports. cwsys# make checksum make: "/usr/ports/Mk/Uses/python.mk" line 367: warning: String comparison operator should be either == or != make: "/usr/ports/Mk/Uses/python.mk" line 367: Malformed conditional (!defined(_PYTHON_VERSION) && !(!empty(_PYTHON_VERSION_MINIMUM) && ( ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && !(!empty(_PYTHON_VERSION_MAXIMUM ) && ( ${__VER} > ${_PYTHON_VERSION_MAXIMUM}))) make: "/usr/ports/Mk/Uses/python.mk" line 367: warning: String comparison operator should be either == or != make: "/usr/ports/Mk/Uses/python.mk" line 367: Malformed conditional (!defined(_PYTHON_VERSION) && !(!empty(_PYTHON_VERSION_MINIMUM) && ( ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && !(!empty(_PYTHON_VERSION_MAXIMUM ) && ( ${__VER} > ${_PYTHON_VERSION_MAXIMUM}))) make: "/usr/ports/Mk/Uses/python.mk" line 367: warning: String comparison operator should be either == or != make: "/usr/ports/Mk/Uses/python.mk" line 367: Malformed conditional (!defined(_PYTHON_VERSION) && !(!empty(_PYTHON_VERSION_MINIMUM) && ( ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && !(!empty(_PYTHON_VERSION_MAXIMUM ) && ( ${__VER} > ${_PYTHON_VERSION_MAXIMUM}))) make: "/usr/ports/Mk/Uses/python.mk" line 367: warning: String comparison operator should be either == or != make: "/usr/ports/Mk/Uses/python.mk" line 367: Malformed conditional (!defined(_PYTHON_VERSION) && !(!empty(_PYTHON_VERSION_MINIMUM) && ( ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && !(!empty(_PYTHON_VERSION_MAXIMUM ) && ( ${__VER} > ${_PYTHON_VERSION_MAXIMUM}))) make: "/usr/ports/Mk/Uses/python.mk" line 367: warning: String comparison operator should be either == or != make: "/usr/ports/Mk/Uses/python.mk" line 367: Malformed conditional (!defined(_PYTHON_VERSION) && !(!empty(_PYTHON_VERSION_MINIMUM) && ( ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && !(!empty(_PYTHON_VERSION_MAXIMUM ) && ( ${__VER} > ${_PYTHON_VERSION_MAXIMUM}))) make: "/usr/ports/Mk/Uses/python.mk" line 367: warning: String comparison operator should be either == or != make: "/usr/ports/Mk/Uses/python.mk" line 367: Malformed conditional (!defined(_PYTHON_VERSION) && !(!empty(_PYTHON_VERSION_MINIMUM) && ( ${__VER} < ${_PYTHON_VERSION_MINIMUM})) && !(!empty(_PYTHON_VERSION_MAXIMUM ) && ( ${__VER} > ${_PYTHON_VERSION_MAXIMUM}))) make: "/usr/ports/Mk/bsd.port.mk" line 2096: warning: String comparison operator should be either == or != make: "/usr/ports/Mk/bsd.port.mk" line 2096: Malformed conditional (defined(MAKE_JOBS_NUMBER_LIMIT) && ( ${MAKE_JOBS_NUMBER_LIMIT} < ${_MAKE_JOBS_NUMBER} )) make: Fatal errors encountered -- cannot continue make: stopped in /usr/ports/www/firefox cwsys# The same errors occur during buildworld. Simply reverting just contrib/bmake/cond.c resolves this issue. The cause of this issue is NetBSD cond.c r1.76, therefore it is safe to revert just the one file without reverting the complete upgrade. http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/make/cond.c?rev=1.76&content-type=text/x-cvsweb-markup&only_with_tag=MAIN -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few.