From owner-svn-ports-all@freebsd.org Wed Dec 26 12:01:59 2018 Return-Path: Delivered-To: svn-ports-all@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 4F91D134F173; Wed, 26 Dec 2018 12:01:59 +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 E70A077D2F; Wed, 26 Dec 2018 12:01:58 +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 CA023233E7; Wed, 26 Dec 2018 12:01:58 +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 wBQC1waR082459; Wed, 26 Dec 2018 12:01:58 GMT (envelope-from mmokhi@FreeBSD.org) Received: (from mmokhi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBQC1wnH082457; Wed, 26 Dec 2018 12:01:58 GMT (envelope-from mmokhi@FreeBSD.org) Message-Id: <201812261201.wBQC1wnH082457@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:01:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488371 - in head/databases/mysql57-client: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mmokhi X-SVN-Commit-Paths: in head/databases/mysql57-client: . files X-SVN-Commit-Revision: 488371 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E70A077D2F 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_SHORT(-0.97)[-0.966,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Dec 2018 12:01:59 -0000 Author: mmokhi Date: Wed Dec 26 12:01:58 2018 New Revision: 488371 URL: https://svnweb.freebsd.org/changeset/ports/488371 Log: databases/mysql57-client: 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. This fixes the build of mysql57-client on the i386 again. PR: 229605 Submitted by: PitDron Reported by: gbromov@gmail.com Sponsored by: The FreeBSD Foundation Modified: head/databases/mysql57-client/Makefile head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake Modified: head/databases/mysql57-client/Makefile ============================================================================== --- head/databases/mysql57-client/Makefile Wed Dec 26 11:54:55 2018 (r488370) +++ head/databases/mysql57-client/Makefile Wed Dec 26 12:01:58 2018 (r488371) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mysql -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) Modified: head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake ============================================================================== --- head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake Wed Dec 26 11:54:55 2018 (r488370) +++ head/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake Wed Dec 26 12:01:58 2018 (r488371) @@ -1,9 +1,17 @@ ---- cmake/os/FreeBSD.cmake.orig 2018-12-19 17:43:09 UTC +--- cmake/os/FreeBSD.cmake.orig 2018-10-04 05:48:22 UTC +++ cmake/os/FreeBSD.cmake -@@ -30,6 +30,12 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER) +@@ -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) @@ -13,7 +21,7 @@ ELSE() MESSAGE(FATAL_ERROR "Unsupported compiler!") ENDIF() -@@ -38,4 +44,6 @@ 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)