From owner-svn-ports-head@freebsd.org  Sun Nov 18 09:04:31 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-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 7006E1130C5C;
 Sun, 18 Nov 2018 09:04:31 +0000 (UTC)
 (envelope-from brnrd@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 0EDA872B90;
 Sun, 18 Nov 2018 09:04:31 +0000 (UTC)
 (envelope-from brnrd@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 DED8F113ED;
 Sun, 18 Nov 2018 09:04:30 +0000 (UTC)
 (envelope-from brnrd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAI94U60055001;
 Sun, 18 Nov 2018 09:04:30 GMT (envelope-from brnrd@FreeBSD.org)
Received: (from brnrd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAI94UPQ055000;
 Sun, 18 Nov 2018 09:04:30 GMT (envelope-from brnrd@FreeBSD.org)
Message-Id: <201811180904.wAI94UPQ055000@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brnrd set sender to
 brnrd@FreeBSD.org using -f
From: Bernard Spil <brnrd@FreeBSD.org>
Date: Sun, 18 Nov 2018 09:04:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r485219 - head/databases/mariadb102-server
X-SVN-Group: ports-head
X-SVN-Commit-Author: brnrd
X-SVN-Commit-Paths: head/databases/mariadb102-server
X-SVN-Commit-Revision: 485219
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 0EDA872B90
X-Spamd-Result: default: False [-0.09 / 15.00];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_HAM_SHORT(-0.09)[-0.093,0]
X-Rspamd-Server: mx1.freebsd.org
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Nov 2018 09:04:31 -0000

Author: brnrd
Date: Sun Nov 18 09:04:30 2018
New Revision: 485219
URL: https://svnweb.freebsd.org/changeset/ports/485219

Log:
  databases/mariadb102-server: Fix build with compression
  
   - Re-add workaround for link issues [1] with
     compression options
  
  [1]: https://jira.mariadb.org/browse/MDEV-14072
  
  PR:		233274
  Submitted by:	Dave Bendit <david ibendit com>
  MFH:		2018Q4

Modified:
  head/databases/mariadb102-server/Makefile

Modified: head/databases/mariadb102-server/Makefile
==============================================================================
--- head/databases/mariadb102-server/Makefile	Sun Nov 18 08:51:08 2018	(r485218)
+++ head/databases/mariadb102-server/Makefile	Sun Nov 18 09:04:30 2018	(r485219)
@@ -215,4 +215,12 @@ post-patch:
 		${WRKSRC}/cmake/os/DragonFly.cmake
 .endif
 
+# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 	 
+post-configure-INNOBASE-on: 	 
+	${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
+		-e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
+		-e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
+		-e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \
+		${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt
+
 .include <bsd.port.post.mk>