From owner-svn-ports-head@FreeBSD.ORG Thu Jan 1 22:41:58 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24B892DF; Thu, 1 Jan 2015 22:41:58 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0FCEE6495F; Thu, 1 Jan 2015 22:41:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t01MfvJp000949; Thu, 1 Jan 2015 22:41:57 GMT (envelope-from sbruno@FreeBSD.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t01Mfv3n000942; Thu, 1 Jan 2015 22:41:57 GMT (envelope-from sbruno@FreeBSD.org) Message-Id: <201501012241.t01Mfv3n000942@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sbruno set sender to sbruno@FreeBSD.org using -f From: Sean Bruno Date: Thu, 1 Jan 2015 22:41:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376033 - in head/databases: mysql55-server mysql55-server/files mysql56-server 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.18-1 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: Thu, 01 Jan 2015 22:41:58 -0000 Author: sbruno Date: Thu Jan 1 22:41:56 2015 New Revision: 376033 URL: https://svnweb.freebsd.org/changeset/ports/376033 QAT: https://qat.redports.org/buildarchive/r376033/ Log: For ARMv6, declare FPSETMASK 0 and FEDISABLEEXCEPT 1. This allows mysql server to build on ARMv6. No need to bump portrevision for everyone else here as this only affects ARM users. PR: 195750 Submitted by: mikael.urankar@gmail.com Approved by: mentor (implicit) Added: head/databases/mysql55-server/files/extra-patch-config.h.cmake (contents, props changed) head/databases/mysql56-server/files/extra-patch-config.h.cmake (contents, props changed) Modified: head/databases/mysql55-server/Makefile head/databases/mysql56-server/Makefile Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Thu Jan 1 22:13:39 2015 (r376032) +++ head/databases/mysql55-server/Makefile Thu Jan 1 22:41:56 2015 (r376033) @@ -85,4 +85,10 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt -.include +.include + +.if ${ARCH} == "armv6" +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake +.endif + +.include Added: head/databases/mysql55-server/files/extra-patch-config.h.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql55-server/files/extra-patch-config.h.cmake Thu Jan 1 22:41:56 2015 (r376033) @@ -0,0 +1,12 @@ +--- config.h.cmake.orig 2014-12-05 16:24:02 UTC ++++ config.h.cmake +@@ -151,7 +151,8 @@ + #cmakedefine HAVE_FESETROUND 1 + #cmakedefine HAVE_FINITE 1 + #cmakedefine HAVE_FP_EXCEPT 1 +-#cmakedefine HAVE_FPSETMASK 1 ++#cmakedefine HAVE_FPSETMASK 0 ++#cmakedefine HAVE_FEDISABLEEXCEPT 1 + #cmakedefine HAVE_FSEEKO 1 + #cmakedefine HAVE_FSYNC 1 + #cmakedefine HAVE_FTIME 1 Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Thu Jan 1 22:13:39 2015 (r376032) +++ head/databases/mysql56-server/Makefile Thu Jan 1 22:41:56 2015 (r376033) @@ -71,4 +71,10 @@ USES+= readline post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt -.include +.include + +.if ${ARCH} == "armv6" +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake +.endif + +.include Added: head/databases/mysql56-server/files/extra-patch-config.h.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysql56-server/files/extra-patch-config.h.cmake Thu Jan 1 22:41:56 2015 (r376033) @@ -0,0 +1,12 @@ +--- config.h.cmake.orig 2014-12-05 16:24:02 UTC ++++ config.h.cmake +@@ -151,7 +151,8 @@ + #cmakedefine HAVE_FESETROUND 1 + #cmakedefine HAVE_FINITE 1 + #cmakedefine HAVE_FP_EXCEPT 1 +-#cmakedefine HAVE_FPSETMASK 1 ++#cmakedefine HAVE_FPSETMASK 0 ++#cmakedefine HAVE_FEDISABLEEXCEPT 1 + #cmakedefine HAVE_FSEEKO 1 + #cmakedefine HAVE_FSYNC 1 + #cmakedefine HAVE_FTIME 1