From owner-svn-ports-all@freebsd.org Tue Jun 25 20:51:45 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 1127115D7432; Tue, 25 Jun 2019 20:51:45 +0000 (UTC) (envelope-from sunpoet@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 A676D75D31; Tue, 25 Jun 2019 20:51:44 +0000 (UTC) (envelope-from sunpoet@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 C5C871DC09; Tue, 25 Jun 2019 20:51:43 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x5PKphlC029443; Tue, 25 Jun 2019 20:51:43 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x5PKphGg029442; Tue, 25 Jun 2019 20:51:43 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201906252051.x5PKphGg029442@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Tue, 25 Jun 2019 20:51:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r505107 - in head/databases/tarantool-c: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/databases/tarantool-c: . files X-SVN-Commit-Revision: 505107 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A676D75D31 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.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,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: Tue, 25 Jun 2019 20:51:45 -0000 Author: sunpoet Date: Tue Jun 25 20:51:43 2019 New Revision: 505107 URL: https://svnweb.freebsd.org/changeset/ports/505107 Log: Update r504086: use an unconditional patch which could be merged upstream Tested by: linimon Added: head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt (contents, props changed) Deleted: head/databases/tarantool-c/files/extra-patch-tnt_CMakeLists.txt Modified: head/databases/tarantool-c/Makefile Modified: head/databases/tarantool-c/Makefile ============================================================================== --- head/databases/tarantool-c/Makefile Tue Jun 25 20:51:37 2019 (r505106) +++ head/databases/tarantool-c/Makefile Tue Jun 25 20:51:43 2019 (r505107) @@ -25,10 +25,4 @@ post-patch: @${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|' @${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake -.include - -.if ${CHOSEN_COMPILER_TYPE} == gcc -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-tnt_CMakeLists.txt -.endif - -.include +.include Added: head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool-c/files/patch-tnt_CMakeLists.txt Tue Jun 25 20:51:43 2019 (r505107) @@ -0,0 +1,15 @@ +--- tnt/CMakeLists.txt.orig 2019-06-14 13:13:47 UTC ++++ tnt/CMakeLists.txt +@@ -49,8 +49,10 @@ set (TNT_SOURCES + # Builds + #----------------------------------------------------------------------------# + +-set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES +- COMPILE_FLAGS "-Wno-implicit-fallthrough") ++if(CMAKE_COMPILER_IS_CLANG AND NOT CMAKE_COMPILER_IS_GNUCC) ++ set_source_files_properties(${PROJECT_SOURCE_DIR}/third_party/uri.c PROPERTIES ++ COMPILE_FLAGS "-Wno-implicit-fallthrough") ++endif() + + ## Static library + project(tnt)