From owner-svn-ports-all@freebsd.org Thu Jun 13 12:49:16 2019 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 39B8E15B12A5; Thu, 13 Jun 2019 12:49:16 +0000 (UTC) (envelope-from linimon@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 D0CB783413; Thu, 13 Jun 2019 12:49:15 +0000 (UTC) (envelope-from linimon@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 69097761; Thu, 13 Jun 2019 12:49:15 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5DCnFOM072679; Thu, 13 Jun 2019 12:49:15 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5DCnFxe072676; Thu, 13 Jun 2019 12:49:15 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <201906131249.x5DCnFxe072676@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Thu, 13 Jun 2019 12:49:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504086 - in head/databases/tarantool-c: . files X-SVN-Group: ports-head X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: in head/databases/tarantool-c: . files X-SVN-Commit-Revision: 504086 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D0CB783413 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.97)[-0.968,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,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: Thu, 13 Jun 2019 12:49:16 -0000 Author: linimon Date: Thu Jun 13 12:49:14 2019 New Revision: 504086 URL: https://svnweb.freebsd.org/changeset/ports/504086 Log: Patch out a CFLAG definition on GCC-based systems to prevent the following error: cc1: error: unrecognized command line option "-Wno-implicit-fallthrough" The CMakeLists.txt file is sufficiently complicated that this seemed like the cleanest approach. Approved by: portmgr (tier-2 blanket) Added: head/databases/tarantool-c/files/ head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt (contents, props changed) Modified: head/databases/tarantool-c/Makefile Modified: head/databases/tarantool-c/Makefile ============================================================================== --- head/databases/tarantool-c/Makefile Thu Jun 13 12:49:09 2019 (r504085) +++ head/databases/tarantool-c/Makefile Thu Jun 13 12:49:14 2019 (r504086) @@ -12,7 +12,7 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libmsgpuck.so:devel/msgpuck -USES= cmake +USES= cmake compiler CMAKE_OFF= ENABLE_BUNDLED_DOCS ENABLE_BUNDLED_MSGPUCK @@ -23,4 +23,10 @@ GH_TAGNAME= d93096a post-patch: @${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|' -.include +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tnt_CMakeLists.txt +.endif + +.include Added: head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt Thu Jun 13 12:49:14 2019 (r504086) @@ -0,0 +1,14 @@ +--- tnt/CMakeLists.txt.orig 2019-02-21 14:33:51 UTC ++++ tnt/CMakeLists.txt +@@ -49,8 +49,9 @@ set (TNT_SOURCES + # Builds + #----------------------------------------------------------------------------# + +-set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES +- COMPILE_FLAGS "-Wno-implicit-fallthrough") ++# -Wno-implicit-fallthrough only has meaning for llvm ++#set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES ++# COMPILE_FLAGS "-Wno-implicit-fallthrough") + + ## Static library + project(tnt)