Date: Wed, 08 Jul 2020 20:28:23 -0700 From: Cy Schubert <Cy.Schubert@cschubert.com> To: "Simon J. Gerraty" <sjg@FreeBSD.org> 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 Message-ID: <202007090328.0693SNo4028242@slippy.cwsent.com> In-Reply-To: <202007082120.068LKCeN067904@repo.freebsd.org> References: <202007082120.068LKCeN067904@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: https://FreeBSD.org NTP: <cy@nwtime.org> Web: https://nwtime.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007090328.0693SNo4028242>