From owner-svn-ports-head@freebsd.org Wed Dec 26 12:08:26 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52DF7134F8DD; Wed, 26 Dec 2018 12:08:26 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E9C028030F; Wed, 26 Dec 2018 12:08:25 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC4182353D; Wed, 26 Dec 2018 12:08:25 +0000 (UTC) (envelope-from mmokhi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBQC8PYH084025; Wed, 26 Dec 2018 12:08:25 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBQC8P0Y084024; Wed, 26 Dec 2018 12:08:25 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201812261208.wBQC8P0Y084024@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmokhi set sender to mmokhi@FreeBSD.org using -f From: Mahdi Mokhtari Date: Wed, 26 Dec 2018 12:08:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488374 - in head/databases/mysql57-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in head/databases/mysql57-server: . files X-SVN-Commit-Revision: 488374 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E9C028030F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.966,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Dec 2018 12:08:26 -0000 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@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) ++