svn commit: r376033 - in head/databases: mysql55-server mysql55-server/files mysql56-server mysql56-server/files

[Sean Bruno]

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 at 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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "armv6"	 
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
+.endif
+ 	 
+.include <bsd.port.post.mk>

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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "armv6"	 
+EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
+.endif
+ 	 
+.include <bsd.port.post.mk>

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