svn commit: r329781 - in head/databases: mysql51-server/files mysql55-client/files mysql55-server/files mysql56-client/files mysql56-server/files

[Tijl Coosemans]

Author: tijl
Date: Tue Oct  8 13:25:00 2013
New Revision: 329781
URL: http://svnweb.freebsd.org/changeset/ports/329781

Log:
  Fix mysql51/55/56 build with clang on i386.
  
  The included yassl library contains inline asm (only for i386) using
  intel syntax which clang does not support.  For now, just disable the
  inline asm when clang is used and use the standard C implementation like
  on every other architecture.
  
  Approved by:	ale (maintainer)

Added:
  head/databases/mysql51-server/files/patch-extra_yassl_taocrypt_include_misc.hpp   (contents, props changed)
  head/databases/mysql55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp   (contents, props changed)
  head/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp   (contents, props changed)
  head/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp   (contents, props changed)
  head/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp   (contents, props changed)

Added: head/databases/mysql51-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql51-server/files/patch-extra_yassl_taocrypt_include_misc.hpp	Tue Oct  8 13:25:00 2013	(r329781)
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/include/misc.hpp.orig
++++ extra/yassl/taocrypt/include/misc.hpp
+@@ -124,7 +124,7 @@
+ 
+ 
+ // no gas on these systems ?, disable for now
+-#if defined(__sun__) || defined (__APPLE__)
++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
+     #define TAOCRYPT_DISABLE_X86ASM
+ #endif
+ 

Added: head/databases/mysql55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql55-client/files/patch-extra_yassl_taocrypt_include_misc.hpp	Tue Oct  8 13:25:00 2013	(r329781)
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/include/misc.hpp.orig
++++ extra/yassl/taocrypt/include/misc.hpp
+@@ -124,7 +124,7 @@
+ 
+ 
+ // no gas on these systems ?, disable for now
+-#if defined(__sun__) || defined (__APPLE__)
++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
+     #define TAOCRYPT_DISABLE_X86ASM
+ #endif
+ 

Added: head/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql55-server/files/patch-extra_yassl_taocrypt_include_misc.hpp	Tue Oct  8 13:25:00 2013	(r329781)
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/include/misc.hpp.orig
++++ extra/yassl/taocrypt/include/misc.hpp
+@@ -124,7 +124,7 @@
+ 
+ 
+ // no gas on these systems ?, disable for now
+-#if defined(__sun__) || defined (__APPLE__)
++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
+     #define TAOCRYPT_DISABLE_X86ASM
+ #endif
+ 

Added: head/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql56-client/files/patch-extra_yassl_taocrypt_include_misc.hpp	Tue Oct  8 13:25:00 2013	(r329781)
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/include/misc.hpp.orig
++++ extra/yassl/taocrypt/include/misc.hpp
+@@ -124,7 +124,7 @@
+ 
+ 
+ // no gas on these systems ?, disable for now
+-#if defined(__sun__) || defined (__APPLE__)
++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
+     #define TAOCRYPT_DISABLE_X86ASM
+ #endif
+ 

Added: head/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql56-server/files/patch-extra_yassl_taocrypt_include_misc.hpp	Tue Oct  8 13:25:00 2013	(r329781)
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/include/misc.hpp.orig
++++ extra/yassl/taocrypt/include/misc.hpp
+@@ -124,7 +124,7 @@
+ 
+ 
+ // no gas on these systems ?, disable for now
+-#if defined(__sun__) || defined (__APPLE__)
++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
+     #define TAOCRYPT_DISABLE_X86ASM
+ #endif
+