From owner-svn-ports-all@freebsd.org Sat Nov 24 19:36:57 2018 Return-Path: Delivered-To: svn-ports-all@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 A52DD1136E5A; Sat, 24 Nov 2018 19:36:57 +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 489B08944C; Sat, 24 Nov 2018 19:36:57 +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 24CD5125BB; Sat, 24 Nov 2018 19:36:57 +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 wAOJav50087781; Sat, 24 Nov 2018 19:36:57 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOJau1c087780; Sat, 24 Nov 2018 19:36:56 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201811241936.wAOJau1c087780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Nov 2018 19:36:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485787 - branches/2018Q4/databases/mariadb102-server X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: branches/2018Q4/databases/mariadb102-server X-SVN-Commit-Revision: 485787 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 489B08944C X-Spamd-Result: default: False [1.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.58)[0.580,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; NEURAL_SPAM_LONG(0.64)[0.643,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 19:36:57 -0000 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 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