Date: Mon, 12 Nov 2018 16:58:52 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484810 - head/databases/mariadb103-server Message-ID: <201811121658.wACGwqJu034620@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Mon Nov 12 16:58:52 2018 New Revision: 484810 URL: https://svnweb.freebsd.org/changeset/ports/484810 Log: databases/mariadb103-server: Fix linking issue - Link issues when INNOBASE is set to DYNAMIC [1] - While here, remove MDEV-14072 fix [1]: https://jira.mariadb.org/browse/MDEV-17560 PR: 233135 Submitted by: Ralf van der Enden <tremere cainites net> Reported by: Dries Michiels <driesm michiels gmail com> Modified: head/databases/mariadb103-server/Makefile Modified: head/databases/mariadb103-server/Makefile ============================================================================== --- head/databases/mariadb103-server/Makefile Mon Nov 12 16:35:45 2018 (r484809) +++ head/databases/mariadb103-server/Makefile Mon Nov 12 16:58:52 2018 (r484810) @@ -131,10 +131,11 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_CLIENT=1 -.for ENGINE in ${OPTIONS_GROUP_ENGINES} +.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor +INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 @@ -197,13 +198,5 @@ post-patch: ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${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?201811121658.wACGwqJu034620>