Date: Mon, 31 Aug 2020 01:26:28 +0000 (UTC) From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547140 - in head/databases/mysqlwsrep57-server: . files Message-ID: <202008310126.07V1QSV1091078@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pkubaj Date: Mon Aug 31 01:26:28 2020 New Revision: 547140 URL: https://svnweb.freebsd.org/changeset/ports/547140 Log: databases/mysqlwsrep57-server: fix build on powerpc64 Use the same fix that mysql57-server needs for building with GCC. MFH: 2020Q3 (fix build blanket) Added: head/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake (contents, props changed) Modified: head/databases/mysqlwsrep57-server/Makefile Modified: head/databases/mysqlwsrep57-server/Makefile ============================================================================== --- head/databases/mysqlwsrep57-server/Makefile Mon Aug 31 01:18:05 2020 (r547139) +++ head/databases/mysqlwsrep57-server/Makefile Mon Aug 31 01:26:28 2020 (r547140) @@ -44,7 +44,7 @@ GH_TUPLE?= codership:mysql-wsrep:${DISTVERSIONPREFIX}$ DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql -NOT_FOR_ARCHS= i386 aarch64 armv6 armv7 powerpc64 +NOT_FOR_ARCHS= i386 aarch64 armv6 armv7 NOT_FOR_ARCHS_REASON= Not supported platform CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ @@ -181,8 +181,11 @@ CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} # Also MySQL code itself needs -Wno-c++11-narrowing when Clang 6 is used. .if ${OSVERSION} >= 1200056 CFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS -CXXFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS -Wno-c++11-narrowing +CXXFLAGS+= -DLZ4_DISABLE_DEPRECATE_WARNINGS LDFLAGS+= -L${LOCALBASE}/lib +. if ${CHOSEN_COMPILER_TYPE} == clang +CXXFLAGS+= -Wno-c++11-narrowing +. endif .endif post-extract: Added: head/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake Mon Aug 31 01:26:28 2020 (r547140) @@ -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) ++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008310126.07V1QSV1091078>