diff options
| -rw-r--r-- | databases/mysql80-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index da38dbf7112b..6f3179fb723d 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -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 diff --git a/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc b/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc new file mode 100644 index 000000000000..a9dd0f59f1a4 --- /dev/null +++ b/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc @@ -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"))) |