Date: Wed, 6 Mar 2019 08:21:23 +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: r494781 - head/databases/mroonga Message-ID: <201903060821.x268LNLO085194@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Mar 6 08:21:23 2019 New Revision: 494781 URL: https://svnweb.freebsd.org/changeset/ports/494781 Log: databases/mroonga: unbreak with libc++ 8 In file included from mrn_path_mapper.cpp:22: In file included from ../mrn_mysql.h:46: In file included from /wrkdirs/usr/ports/databases/mysql56-server/work/mysql-5.6.43/sql/sql_plugin.h:19: In file included from /wrkdirs/usr/ports/databases/mysql56-server/work/mysql-5.6.43/include/my_global.h:319: In file included from /usr/include/c++/v1/math.h:309: In file included from /usr/include/c++/v1/type_traits:406: In file included from /usr/include/c++/v1/cstddef:38: ../version:1:1: error: expected unqualified-id 9.00 ^ PR: 236192 Approved by: portmgr blanket Modified: head/databases/mroonga/Makefile (contents, props changed) Modified: head/databases/mroonga/Makefile ============================================================================== --- head/databases/mroonga/Makefile Wed Mar 6 07:31:17 2019 (r494780) +++ head/databases/mroonga/Makefile Wed Mar 6 08:21:23 2019 (r494781) @@ -25,6 +25,12 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS +post-patch: +# Avoid conflict with C++20 <version> by adding .txt suffix + @${MV} ${WRKSRC}/version ${WRKSRC}/version.txt + @${REINPLACE_CMD} -i .c++20 's,srcdir)/version[[:>:]],&.txt,' \ + ${WRKSRC}/Makefile.in + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/ha_mroonga.so.0.0.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903060821.x268LNLO085194>