svn commit: r477036 - in head/databases/mysql80-server: . files

[Mahdi Mokhtari]

Author: mmokhi
Date: Sun Aug 12 19:10:43 2018
New Revision: 477036
URL: https://svnweb.freebsd.org/changeset/ports/477036

Log:
  databases/mysql80-server: Fix build on default Clang of 10.4-base
  Add sse4.2 flag to CXXFLAGS on 10.4 case.
  The build-script needs it when using intrin lib on crc32
  
  Sponsored by:	The FreeBSD Foundation

Added:
  head/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc   (contents, props changed)
Modified:
  head/databases/mysql80-server/Makefile

Modified: head/databases/mysql80-server/Makefile
==============================================================================
--- head/databases/mysql80-server/Makefile	Sun Aug 12 18:43:13 2018	(r477035)
+++ head/databases/mysql80-server/Makefile	Sun Aug 12 19:10:43 2018	(r477036)
@@ -148,6 +148,11 @@ SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
 SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
 .endif
 
+# required for SSE-4.2 support on the default Clang++ on 10.4
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
+CXXFLAGS+=	-msse4.2
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base

Added: head/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc	Sun Aug 12 19:10:43 2018	(r477036)
@@ -0,0 +1,11 @@
+--- storage/innobase/ut/crc32.cc.orig	2018-08-12 11:09:52 UTC
++++ storage/innobase/ut/crc32.cc
+@@ -108,7 +108,7 @@ external tools. */
+ */
+ #if defined(__SSE4_2__) || defined(__clang__) || !defined(__GNUC__) || \
+     __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 9)
+-#include <nmmintrin.h>
++#include <x86intrin.h>
+ #else
+ // GCC 4.8 without -msse4.2.
+ MY_ATTRIBUTE((target("sse4.2")))