From nobody Fri Aug 4 15:57:31 2023 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 4RHVj75djTz4Tp97; Fri, 4 Aug 2023 15:57:31 +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 4RHVj757twz3XFH; Fri, 4 Aug 2023 15:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691164651; 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=pLeRFYrFA5NLIiYM4ghZObwqRtjBW0I9o4iRyHLC0IY=; b=Yr4R/hyYP27H0ScVzJxWwsl9oqiL0gzgyFaB4jveUmdc7Rx5Azq+Fyw34LIB+8xnY7OPtZ zw2Fn7aefh1x81ANVK9q0D2FvUH6naJqz7VkEvqf2GcMGzlJqPUdIOeihxxAyj6vpHLl2a hrcoX5YRauoe+3RgmYYJw0yeBBUVfeikVv2ujgchG8OGFk8JMMSgLJhzpcPpRgP6geowjy qq7x5ose3PMoVgoxvxiE0+ZPcfv3wLryA+ZnDTJlHaBoBW1T1TaVTtxyzINdZv3fQjX/Ff 41wsTpx8vbnrICqcmrtEN+Vh5uNvMqFAiniZ7FxtZzi5tEEipRtQFf+W2N+SGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691164651; 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=pLeRFYrFA5NLIiYM4ghZObwqRtjBW0I9o4iRyHLC0IY=; b=KAYTdPAdpBKFSu9TwEws48mTF+F/6vBd9oNFfJttcnSkYFeB2NJDnQ3zrAOB/Xg+A0ypLO ePE1yjiBlmRXLvd7zaCNN19KhHrAGNMn6LpllUpDf5jDG2kamMRbHAvS4Z3uU5hiPemxFc /gNcD2Lw4rED2WExEELKrt22cluL8kWifTAaN8UBtCy1/VbjOapJWZA/NaGB/65eYC+/l/ Rs+x0lPmkoc6pCaiHFscNZoP+2vW/3CPiOWL0P3nx+edubSRESXJ8d0ZyXjvvKbLQJa4PI ZEjCbzXrdd3iWIHOyRt0WL40IEsoRzTZiu8MURTdxcIOS17BpE/lhf65Va51lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691164651; a=rsa-sha256; cv=none; b=g7O/Qc4qj8po4biQE4zaLfDl9vC8i8JYXYcaQxaC779emuuLkvMIM8T+Dajn01GyIFEePY euy8ZoPiI2W5vCmFQIw1F3Yib0ZIPTMf40dcg+JwHkkghIoVn5fFTL9C6x47+odPQiEEVR gDZUkHDuvEdyXCA/zlzdXJ8eog/89g3JcVBO/V+PSxgMARSpPkKRP8z15VU3PIdkM5kG/y N4nI7MLQ2d0MzxZ9knlYjm/FlfZG8y0D7RDPi4Ie28e8hFbrEvBZJ9lHFYya0BTlo+hIf2 aO4ot9LHaa1uBFh2CKsqsD5nHdRUv/1ZDzry9kIh4yQzr+B89oeTVq6eOaZB7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RHVj745P0z17x2; Fri, 4 Aug 2023 15:57:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 374FvV3k076102; Fri, 4 Aug 2023 15:57:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 374FvVDO076101; Fri, 4 Aug 2023 15:57:31 GMT (envelope-from git) Date: Fri, 4 Aug 2023 15:57:31 GMT Message-Id: <202308041557.374FvVDO076101@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 96c827a89186 - main - devel/rapidjson: unbreak tests 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96c827a89186661d75b54acd1f11c9d962a96a1f Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=96c827a89186661d75b54acd1f11c9d962a96a1f commit 96c827a89186661d75b54acd1f11c9d962a96a1f Author: Jan Beich AuthorDate: 2023-08-04 15:56:48 +0000 Commit: Yuri Victorovich CommitDate: 2023-08-04 15:57:29 +0000 devel/rapidjson: unbreak tests PR: 272936 --- devel/rapidjson/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile index d79ac169a871..2fcda9455e99 100644 --- a/devel/rapidjson/Makefile +++ b/devel/rapidjson/Makefile @@ -14,7 +14,9 @@ LICENSE_FILE= ${WRKSRC}/license.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept TEST_DEPENDS= googletest>0:devel/googletest \ - valgrind:devel/valgrind + ${TEST_DEPENDS_${ARCH}} +TEST_DEPENDS_amd64= valgrind:devel/valgrind +TEST_DEPENDS_i386= valgrind:devel/valgrind USES= cmake:testing compiler:c++11-lang cpe pathfix CPE_VENDOR= tencent @@ -24,9 +26,10 @@ GH_ACCOUNT= Tencent NO_ARCH= yes -CMAKE_ARGS= -DGTEST_INCLUDE_DIR=${LOCALBASE}/include -DGTESTSRC_FOUND=TRUE -CMAKE_OFF= RAPIDJSON_BUILD_TESTS RAPIDJSON_BUILD_EXAMPLES +CMAKE_ARGS= -DGTEST_SOURCE_DIR=${NONEXISTENT} -DGTEST_INCLUDE_DIR=${LOCALBASE}/include -DGTESTSRC_FOUND=TRUE +CMAKE_OFF= RAPIDJSON_BUILD_CXX11 RAPIDJSON_BUILD_TESTS RAPIDJSON_BUILD_EXAMPLES CMAKE_TESTING_ON= RAPIDJSON_BUILD_TESTS +CMAKE_TESTING_ARGS= ${"${TEST_DEPENDS:Mvalgrind*}":?:-DCMAKE_CTEST_ARGUMENTS\:STRING="-E;valgrind"} OPTIONS_DEFINE= DOXYGEN OPTIONS_DEFAULT=${OPTIONS_DEFINE}