Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Nov 2018 19:36:56 +0000 (UTC)
From:      Bernard Spil <brnrd@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r485787 - branches/2018Q4/databases/mariadb102-server
Message-ID:  <201811241936.wAOJau1c087780@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brnrd
Date: Sat Nov 24 19:36:56 2018
New Revision: 485787
URL: https://svnweb.freebsd.org/changeset/ports/485787

Log:
  MFH: r485219
  
  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>
  
  Approved by:	ports-secteam (miwi)

Modified:
  branches/2018Q4/databases/mariadb102-server/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/databases/mariadb102-server/Makefile
==============================================================================
--- branches/2018Q4/databases/mariadb102-server/Makefile	Sat Nov 24 19:34:58 2018	(r485786)
+++ branches/2018Q4/databases/mariadb102-server/Makefile	Sat Nov 24 19:36:56 2018	(r485787)
@@ -211,4 +211,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>



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