From owner-svn-src-head@freebsd.org Wed Aug 22 11:56:43 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 49C6E10864F7; Wed, 22 Aug 2018 11:56:43 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F10E1705EF; Wed, 22 Aug 2018 11:56:42 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D32D612A3B; Wed, 22 Aug 2018 11:56:42 +0000 (UTC) (envelope-from arichardson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7MBugQV024955; Wed, 22 Aug 2018 11:56:42 GMT (envelope-from arichardson@FreeBSD.org) Received: (from arichardson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7MBugYB024954; Wed, 22 Aug 2018 11:56:42 GMT (envelope-from arichardson@FreeBSD.org) Message-Id: <201808221156.w7MBugYB024954@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arichardson set sender to arichardson@FreeBSD.org using -f From: Alex Richardson Date: Wed, 22 Aug 2018 11:56:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338190 - head/lib/libexpat X-SVN-Group: head X-SVN-Commit-Author: arichardson X-SVN-Commit-Paths: head/lib/libexpat X-SVN-Commit-Revision: 338190 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 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: Wed, 22 Aug 2018 11:56:43 -0000 Author: arichardson Date: Wed Aug 22 11:56:42 2018 New Revision: 338190 URL: https://svnweb.freebsd.org/changeset/base/338190 Log: Stop using unifdef to generate bsdxml.h The current invocation of unifdef causes the build to fail when using a shell with -o pipefail on by default since unifdef will return a non-zero exit status if it changes something. The only thing this call to unifdef does is remove 5 lines that will be ignored by the compiler anyway. Furthermore, it is the only make rule in the source tree that requires unifdef. Removing this call also makes it slightly easier to build without inhering $PATH (D16815) since we don't need unifdef anymore. I also noticed that the sed call to replace the include guard has been broken for over 10 years since the import of expat 2.0.1 changed it from `XmlParse_INCLUDED` to `Expat_INCLUDED`. I could also fix this but since it's been broken for so long and no one noticed, it's probably not necessary. Reviewed By: emaste Approved By: jhb (mentor) Differential Revision: https://reviews.freebsd.org/D14317 Modified: head/lib/libexpat/Makefile Modified: head/lib/libexpat/Makefile ============================================================================== --- head/lib/libexpat/Makefile Wed Aug 22 10:07:15 2018 (r338189) +++ head/lib/libexpat/Makefile Wed Aug 22 11:56:42 2018 (r338190) @@ -18,14 +18,13 @@ CLEANFILES= bsdxml.h bsdxml_external.h WARNS?= 2 # OK, so it is not entirely unadulterated: we amend the COPYING to -# point people to the right place, get rid of some VMS stuff and use -# FreeBSD-style include guards. We also want to point it at the new -# bsdxml_external.h rather than the old expat_external.h file. +# point people to the right place and use FreeBSD-style include guards. +# We also want to point it at the new bsdxml_external.h rather than the +# old expat_external.h file. bsdxml.h: expat.h - unifdef -U__VMS < ${.ALLSRC} | \ sed -e 's/XmlParse_INCLUDED/_BSD_XML_H_/' \ -e 's/COPYING/src\/contrib\/expat\/COPYING/' \ - -e 's/expat_external/bsdxml_external/' \ + -e 's/expat_external/bsdxml_external/' ${.ALLSRC} \ > ${.TARGET} bsdxml_external.h: expat_external.h