svn commit: r488374 - in head/databases/mysql57-server: . files
Mahdi Mokhtari
mmokhi at FreeBSD.org
Wed Dec 26 12:08:26 UTC 2018
Author: mmokhi
Date: Wed Dec 26 12:08:25 2018
New Revision: 488374
URL: https://svnweb.freebsd.org/changeset/ports/488374
Log:
databases/mysql57-server: Fix build for i386
Make MySQL build-script assume that FreeBSD's Clang (on i386)
doesn't have "atomic_*" functions builtin implemented.
This is added to cmake/os/FreeBSD.cmake to make the merge for upstream easier.
PR: 229605
Reported by: gbromov at gmail.com
Sponsored by: The FreeBSD Foundation
Added:
head/databases/mysql57-server/files/patch-cmake_os_FreeBSD.cmake (contents, props changed)
Modified:
head/databases/mysql57-server/Makefile
Modified: head/databases/mysql57-server/Makefile
==============================================================================
--- head/databases/mysql57-server/Makefile Wed Dec 26 12:07:41 2018 (r488373)
+++ head/databases/mysql57-server/Makefile Wed Dec 26 12:08:25 2018 (r488374)
@@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 5.7.24
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.7
PKGNAMESUFFIX?= 57-server
Added: head/databases/mysql57-server/files/patch-cmake_os_FreeBSD.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mysql57-server/files/patch-cmake_os_FreeBSD.cmake Wed Dec 26 12:08:25 2018 (r488374)
@@ -0,0 +1,31 @@
+--- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC
++++ cmake/os/FreeBSD.cmake
+@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
+ IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
+ MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
+ ENDIF()
++ CHECK_C_SOURCE_RUNS("
++ int main()
++ {
++ return (__clang_major__ >= 4);
++ }" I386_ATOMIC_BUILTINS)
++ IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
++ SET(HAVE_GCC_ATOMIC_BUILTINS CACHE INTERNAL "")
++ ENDIF()
++ ELSEIF(CMAKE_COMPILER_IS_GNUCC)
++ EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
++ OUTPUT_VARIABLE GCC_VERSION)
++ IF(GCC_VERSION VERSION_LESS 4.4)
++ MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
++ ENDIF()
+ ELSE()
+ MESSAGE(FATAL_ERROR "Unsupported compiler!")
+ ENDIF()
+@@ -38,4 +52,6 @@ ENDIF()
+ # Should not be needed any more, but kept for easy resurrection if needed
+ # #Legacy option, maybe not needed anymore , taken as is from autotools build
+ # ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
+-
++# For GCC maybe it's also good idea to use
++# ADD_DEFINITIONS(-D_GNU_SOURCE)
++
More information about the svn-ports-head
mailing list