svn commit: r489183 - head/databases/mysql57-client/files

Mark Linimon linimon at FreeBSD.org
Thu Jan 3 15:05:53 UTC 2019


Author: linimon
Date: Thu Jan  3 15:05:51 2019
New Revision: 489183
URL: https://svnweb.freebsd.org/changeset/ports/489183

Log:
  Fix build on GCC-based architectures by removing default assumption that
  FreeBSD == clang.
  
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake

Modified: head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake
==============================================================================
--- head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake	Thu Jan  3 15:01:04 2019	(r489182)
+++ head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake	Thu Jan  3 15:05:51 2019	(r489183)
@@ -1,9 +1,11 @@
 --- 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)
+@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
      IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
        MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
      ENDIF()
+-  ELSE()
+-    MESSAGE(FATAL_ERROR "Unsupported compiler!")
 +    CHECK_C_SOURCE_RUNS("
 +      int main()
 +      {
@@ -18,10 +20,9 @@
 +    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()
+ 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)


More information about the svn-ports-head mailing list