Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Jan 2019 15:15:06 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r489185 - branches/2019Q1/databases/mysql57-client/files
Message-ID:  <201901031515.x03FF6Am006452@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Thu Jan  3 15:15:05 2019
New Revision: 489185
URL: https://svnweb.freebsd.org/changeset/ports/489185

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

Modified:
  branches/2019Q1/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake
==============================================================================
--- branches/2019Q1/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake	Thu Jan  3 15:07:21 2019	(r489184)
+++ branches/2019Q1/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake	Thu Jan  3 15:15:05 2019	(r489185)
@@ -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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901031515.x03FF6Am006452>