From nobody Mon Nov 29 15:11:27 2021 X-Original-To: dev-commits-src-branches@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 87F0718AC9C3; Mon, 29 Nov 2021 15:11:29 +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 4J2phw37h0z4bRH; Mon, 29 Nov 2021 15:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1368024B89; Mon, 29 Nov 2021 15:11:28 +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 1ATFBSJ2022671; Mon, 29 Nov 2021 15:11:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATFBRAx022670; Mon, 29 Nov 2021 15:11:27 GMT (envelope-from git) Date: Mon, 29 Nov 2021 15:11:27 GMT Message-Id: <202111291511.1ATFBRAx022670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7cc6e39cb6a9 - stable/13 - Do not build libatf-c++ when WITHOUT_CXX List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7cc6e39cb6a934dea99a6aff336b353e938fbc58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638198688; 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=wMpyX1/2sb1JdDyTdHHZ3To5aDkwOrlUjK7lCnL1IeE=; b=qs/DfNMUR0jz4gGye92Z8WU4T72ouvSCQs24UGFNsPAxheHnjoTybry5GVEOr2ZacMa5RB o/09DeyMsNGPeb33cA4n98nlFi9W2MOzwzMVWoZr3sLdFJ8X1bUJwJwDaFlM7xn/zuzL9Y JCJ/Pt2Z8qLJxXxl4AnxZgaKbC6cOz+twed5S5Ad1LDcdvDczO85OiIhzRO2CfS4BUlCql ITRjeXtD9zbf0S5JZ4+caBa4WInw4exeSnGwbEhVmVUmyZ/MiyoQ5gn9iXBImlA/WqoKpz yJe/8tuEUyK6yOoKl7nkBy/RlUm6XH4kpITZH1WohgQ5EOx1VDDwWisZp2KjOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638198688; a=rsa-sha256; cv=none; b=hweyWkqFjAdDd5WhMyx6wYy1hh7cDGtREJ+gddZYv4ZdYsA367zWj1gpDk+Erv6Q640fOE 7YYgcvYc1eDxwMS7IeLXTTkjS74lbqCJmPHex9m/pseiFR0/2sbG049Xu+ayZPqOmjSfL8 k5yskKKWApamOktsngP61X2s/EpO0yQnFE2qdkpbrgcE/VdkH95QaWbbvkVtMFhl9hVaur MN1dNlWxf1IZrQ3Bw294uaaYEG+19W2h3TerpEeB+APM1ue1KGHQbewh0tmXhmzyQqDMVD pCQXYf4BVjIxD8aziOdy+ltBPduIs7Je498hcXKAjK+h7oEQy106GRI5sXfUSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7cc6e39cb6a934dea99a6aff336b353e938fbc58 commit 7cc6e39cb6a934dea99a6aff336b353e938fbc58 Author: Ed Maste AuthorDate: 2021-10-29 03:01:21 +0000 Commit: Ed Maste CommitDate: 2021-11-29 15:10:53 +0000 Do not build libatf-c++ when WITHOUT_CXX libatf-c++ requires C++ support. From jrtc27: bit slightly odd this isn't gated by MK_TESTS (which itself depends on MK_CXX), but this makes sense given the current behaviour. Reported by: Michael Dexter, Build Option Survey Reviewed by: imp, jrtc27 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32732 (cherry picked from commit 6ce99625ca7acecaa64723f0440007eb3f60f53d) --- lib/atf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/atf/Makefile b/lib/atf/Makefile index baadf535b424..05c7973fdc02 100644 --- a/lib/atf/Makefile +++ b/lib/atf/Makefile @@ -27,8 +27,8 @@ .include -SUBDIR= libatf-c \ - libatf-c++ \ +SUBDIR= libatf-c +SUBDIR.${MK_CXX}+= libatf-c++ SUBDIR.${MK_TESTS}+= tests