Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 22 Aug 2018 11:56:42 +0000 (UTC)
From:      Alex Richardson <arichardson@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r338190 - head/lib/libexpat
Message-ID:  <201808221156.w7MBugYB024954@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808221156.w7MBugYB024954>