diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-08-31 01:26:28 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2020-08-31 01:26:28 +0000 |
| commit | 89eb8b58b9e2868a1a80b75bac60b6a45c89af2b (patch) | |
| tree | bb81c736a960bb12a07297f684e957b525c65027 /databases/mysqlwsrep57-server | |
| parent | 50340f51921d548fcf075104f6c5db9abd015f08 (diff) | |
| download | ports-89eb8b58b9e2868a1a80b75bac60b6a45c89af2b.tar.gz ports-89eb8b58b9e2868a1a80b75bac60b6a45c89af2b.zip | |
databases/mysqlwsrep57-server: fix build on powerpc64
Use the same fix that mysql57-server needs for building with GCC.
MFH: 2020Q3 (fix build blanket)
Notes
Notes:
svn path=/head/; revision=547140
Diffstat (limited to 'databases/mysqlwsrep57-server')
| -rw-r--r-- | databases/mysqlwsrep57-server/Makefile | 7 | ||||
| -rw-r--r-- | databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake | 31 |
2 files changed, 36 insertions, 2 deletions
diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 1f3523eea3a3..7bac5cdf0c28 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -44,7 +44,7 @@ GH_TUPLE?= codership:mysql-wsrep:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSION 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: diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake new file mode 100644 index 000000000000..64b809e3bd45 --- /dev/null +++ b/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake @@ -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) ++ |