From owner-svn-ports-head@FreeBSD.ORG Tue Oct 8 13:25:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id ACDDCEE; Tue, 8 Oct 2013 13:25:01 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 996122354; Tue, 8 Oct 2013 13:25:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r98DP10l023366; Tue, 8 Oct 2013 13:25:01 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r98DP0qe023355; Tue, 8 Oct 2013 13:25:00 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201310081325.r98DP0qe023355@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 8 Oct 2013 13:25:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329781 - in head/databases: mysql51-server/files mysql55-client/files mysql55-server/files mysql56-client/files mysql56-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Oct 2013 13:25:01 -0000 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 +