From nobody Mon Oct 03 17:12:35 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mh6pW4MHTz4djSd; Mon, 3 Oct 2022 17:12:35 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mh6pW2s10z3VwZ; Mon, 3 Oct 2022 17:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664817155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q6xWa725OBnkC5A9/s7wHwrK0+hVFWGNiT9ZeZRxqAo=; b=yjzkqEHopXEvveyCBbPU2hHdSurdPuVNTZyLzaoYrsq91scsHlIy5VFi3xgcgsJyYx5YPm MgDux7Hq86piP6nKyfxqAScU45HRCgox1veVySu29SApYlPkyrZR1rjdZufcEEzwj1mR9r IWt3yxkzhw5ob4pxR83mguSPZv3xzQsLAeNsh5EZkn2Px5WlI1kSGLi2Yjwza6U6jXMGVo VWyZtYWXG4shwEK07Dt+zp7B/Si65rTnrjfI2OIndwJN85mcmmwDaR/coT2f0n7mbWlKXE WKIYSw8TwPaE5x7CjsUgrwwev/TflRJotzmo2034BrXdoaddUe2INBoiS7mOJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mh6pW1xtQzGyv; Mon, 3 Oct 2022 17:12:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 293HCZI3011699; Mon, 3 Oct 2022 17:12:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 293HCZ9K011698; Mon, 3 Oct 2022 17:12:35 GMT (envelope-from git) Date: Mon, 3 Oct 2022 17:12:35 GMT Message-Id: <202210031712.293HCZ9K011698@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 34e96380886b - main - databases/leveldb: Convert to USES=cmake:testing List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34e96380886b2ae59b25ab4a9553c32b484a6bca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664817155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q6xWa725OBnkC5A9/s7wHwrK0+hVFWGNiT9ZeZRxqAo=; b=ZUpEpn+JfCsszX9LVFyOPyTE/c1KAhAKuIKu9ujbfOjuan+gVYbqht6It8Sq3I7JQZE6eB wJ3oXHg2U3oW5q4n1ueTT6Yulwr0r4r4cakEbU22qIAEI0rk2mHiZ1QNHqToQSYoxtqlfm NvhWtThPdso57h3GqTN0HIXbWyu46Kf/OjKyMfgOeMF5qfr3o+qmdjzUIYHsYO6XQCuiYt jL9mxhDe+/aipSVpHMzUWVaW0iBdbgWTKDfZ8Ge7kPp028WpAqu1+UOtD98D9mhmN5HC/X Kgfp3fo2L5NIb9qiP7Io5zGqAtVtuWkXSM5kpQjMnZXy2FIzLiQiVSFGulfl0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664817155; a=rsa-sha256; cv=none; b=kZuYoVQaltoNMsuWElYQJbDV0hArfBYLZ0pse3JArRoQT9COC1a6uwLHsIr4x32hFoEN1w 5WNOKLiBDpdy/PBKF4RjI3wwtSdok2kFAUgGyrygKflQbaX3peyBQVEnjm/uwy8T+afylg E5fzdlpEIMzhgiMIeisMDt5RepFkfpBaoY4H3ndVyS8M7l5OWc3XIxwoyT9Hh/ptJ/g0Gw GbdjPyxmG1A9fW8PdfmfdzZj93YoN/idsOimsrR2PSHv+VMRS0gYuYGTA/X9TPbawiYhm2 eEU8rqroTUFEkQDbKFkqzbYUKv1LIIVCXeYuwOULUnh/0TVDpaR5hEJBl4JD+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=34e96380886b2ae59b25ab4a9553c32b484a6bca commit 34e96380886b2ae59b25ab4a9553c32b484a6bca Author: Po-Chuan Hsieh AuthorDate: 2022-10-03 17:02:51 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-10-03 17:10:15 +0000 databases/leveldb: Convert to USES=cmake:testing --- databases/leveldb/Makefile | 6 +++++- databases/leveldb/files/patch-CMakeLists.txt | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/databases/leveldb/Makefile b/databases/leveldb/Makefile index c73f1013018e..5f115e69ac25 100644 --- a/databases/leveldb/Makefile +++ b/databases/leveldb/Makefile @@ -9,10 +9,14 @@ WWW= https://github.com/google/leveldb LICENSE= BSD3CLAUSE -USES= cmake compiler:c++11-lang localbase +TEST_DEPENDS= benchmark>=0:devel/benchmark \ + googletest>=0:devel/googletest + +USES= cmake:testing compiler:c++11-lang localbase:ldflags CMAKE_OFF= LEVELDB_BUILD_TESTS CMAKE_ON= BUILD_SHARED_LIBS LEVELDB_BUILD_BENCHMARKS LEVELDB_INSTALL +CMAKE_TESTING_ON= LEVELDB_BUILD_TESTS USE_CXXSTD= c++11 USE_LDCONFIG= yes diff --git a/databases/leveldb/files/patch-CMakeLists.txt b/databases/leveldb/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..2983e1b6df73 --- /dev/null +++ b/databases/leveldb/files/patch-CMakeLists.txt @@ -0,0 +1,25 @@ +--- CMakeLists.txt.orig 2021-02-23 20:54:37 UTC ++++ CMakeLists.txt +@@ -295,22 +295,6 @@ if(LEVELDB_BUILD_TESTS) + set(install_gmock OFF) + set(build_gmock ON) + +- # This project is tested using GoogleTest. +- add_subdirectory("third_party/googletest") +- +- # This project uses Google benchmark for benchmarking. +- set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE) +- set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE) +- add_subdirectory("third_party/benchmark") +- +- # GoogleTest triggers a missing field initializers warning. +- if(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- set_property(TARGET gtest +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- set_property(TARGET gmock +- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers) +- endif(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS) +- + function(leveldb_test test_file) + get_filename_component(test_target_name "${test_file}" NAME_WE) +