diff options
| author | sbruno <sbruno@FreeBSD.org> | 2015-01-01 22:41:56 +0000 |
|---|---|---|
| committer | sbruno <sbruno@FreeBSD.org> | 2015-01-01 22:41:56 +0000 |
| commit | 64ec4d7ef81ec21af94691820df6e23f3f4cd06c (patch) | |
| tree | 1ba54bde6eae0da8773137936520b2f99c7ef144 | |
| parent | d4562a0e3f6713d9f50a06929ae808a85b9c3fda (diff) | |
| download | FreeBSD-ports-64ec4d7ef81ec21af94691820df6e23f3f4cd06c.zip FreeBSD-ports-64ec4d7ef81ec21af94691820df6e23f3f4cd06c.tar.gz | |
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)
| -rw-r--r-- | databases/mysql55-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/mysql55-server/files/extra-patch-config.h.cmake | 12 | ||||
| -rw-r--r-- | databases/mysql56-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/mysql56-server/files/extra-patch-config.h.cmake | 12 |
4 files changed, 38 insertions, 2 deletions
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile index 6f91b9a..e79d1d0 100644 --- a/databases/mysql55-server/Makefile +++ b/databases/mysql55-server/Makefile @@ -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> diff --git a/databases/mysql55-server/files/extra-patch-config.h.cmake b/databases/mysql55-server/files/extra-patch-config.h.cmake new file mode 100644 index 0000000..3ac1add --- /dev/null +++ b/databases/mysql55-server/files/extra-patch-config.h.cmake @@ -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 diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index fda6da0..d25acd0 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -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> diff --git a/databases/mysql56-server/files/extra-patch-config.h.cmake b/databases/mysql56-server/files/extra-patch-config.h.cmake new file mode 100644 index 0000000..3ac1add --- /dev/null +++ b/databases/mysql56-server/files/extra-patch-config.h.cmake @@ -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 |
