Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Mar 2019 18:34:56 +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: r494630 - head/databases/mysql++3
Message-ID:  <201903041834.x24IYuDu086366@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Mar  4 18:34:55 2019
New Revision: 494630
URL: https://svnweb.freebsd.org/changeset/ports/494630

Log:
  databases/mysql++3: unbreak with libc++ 8
  
  In file included from ./lib/beemutex.cpp:31:
  In file included from ./lib/beemutex.h:46:
  In file included from ./lib/exceptions.h:34:
  In file included from ./lib/options.h:39:
  In file included from /usr/include/c++/v1/deque:163:
  In file included from /usr/include/c++/v1/__split_buffer:6:
  In file included from /usr/include/c++/v1/type_traits:406:
  In file included from /usr/include/c++/v1/cstddef:38:
  ./version:1:2: error: invalid preprocessing directive
   #!/bin/sh
    ^
  ./version:2:1: error: unknown type name 'echo'
  echo 3.2.2
  ^
  ./version:2:6: error: expected unqualified-id
  echo 3.2.2
       ^
  
  PR:		236192
  Approved by:	portmgr blanket

Modified:
  head/databases/mysql++3/Makefile   (contents, props changed)

Modified: head/databases/mysql++3/Makefile
==============================================================================
--- head/databases/mysql++3/Makefile	Mon Mar  4 18:34:48 2019	(r494629)
+++ head/databases/mysql++3/Makefile	Mon Mar  4 18:34:55 2019	(r494630)
@@ -24,6 +24,11 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
+post-patch:
+# Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
+	@${REINPLACE_CMD} -i .c++20 '/MYSQLPP_CXXFLAGS/s/-I/-iquote/' \
+		${WRKSRC}/Makefile.in
+
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} pdf ${STAGEDIR}${DOCSDIR})



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