Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Mar 2019 08:21:30 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494782 - head/devel/xsd
Message-ID:  <201903060821.x268LUeB087541@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Mar  6 08:21:29 2019
New Revision: 494782
URL: https://svnweb.freebsd.org/changeset/ports/494782

Log:
  devel/xsd: unbreak with libc++ 8
  
  In file included from xsd/xsd/xsd.cxx:5:
  In file included from /usr/include/c++/v1/map:480:
  In file included from /usr/include/c++/v1/__tree:15:
  In file included from /usr/include/c++/v1/iterator:417:
  In file included from /usr/include/c++/v1/__functional_base:15:
  In file included from /usr/include/c++/v1/type_traits:406:
  In file included from /usr/include/c++/v1/cstddef:38:
  libxsd-frontend/version:1:1: error: expected unqualified-id
  2.0.0
  ^
  
  PR:		236192
  Reported by:	pkg-fallout
  Approved by:	portmgr blanket

Modified:
  head/devel/xsd/Makefile   (contents, props changed)

Modified: head/devel/xsd/Makefile
==============================================================================
--- head/devel/xsd/Makefile	Wed Mar  6 08:21:23 2019	(r494781)
+++ head/devel/xsd/Makefile	Wed Mar  6 08:21:29 2019	(r494782)
@@ -39,6 +39,9 @@ post-patch:
 # Use devel/build instead of the port's bundled copy.
 	${RM} -r ${WRKSRC}/build-0.3
 	${LN} -s ${LOCALBASE}/include/build-0.3 ${WRKSRC}/build-0.3
+# Avoid conflict with C++20 <version> by adding .txt suffix
+	@${MV} ${WRKSRC}/libxsd-frontend/version \
+		${WRKSRC}/libxsd-frontend/version.txt
 
 post-install:
 # Install examples into the right directory.



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