From nobody Thu Aug 10 23:55:31 2023 X-Original-To: dev-commits-src-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 4RMP1w189lz4TlfG; Thu, 10 Aug 2023 23:55:32 +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 4RMP1w0dGwz3bFp; Thu, 10 Aug 2023 23:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691711732; 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=VyRjnDYlv6TGXLA/+uskL+DQX2jckiwd6RYxG2V4CGg=; b=pvLRjhsofyjC3uqLi+7HWCL2/t6BCLaDYyhiXn39TutwXu755+c7KmI1chKaWziFA67ty1 JWpRJWYW5yD8VSMHSQKQVw+/daShV5ioZADijM36VmFU4ZQRXLYkezaIbPpIwyaULNDvlX u9t8FvLDOmgI0TmMmSwCGaony7u6N4SJyO7ngR2QJVqiboMel4OilC/IJDjAIpkKSTFw+0 EM5yvGL0fse+j35BKQyuXVK5Ee43UFhW9OLjISaCCPyyRFqRjbGc1jL1/Mfh20WPYV3koM w8pRxL6J5BY4ZkX2f5r2Zl8rxtcbcyanqNNv0pOJnxbVv5AEhdqK7e+opKzxMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691711732; 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=VyRjnDYlv6TGXLA/+uskL+DQX2jckiwd6RYxG2V4CGg=; b=rzkvv/VQeYhdtqGN2KungYuymm44XyuYVlYIbj9VcjRtJNRpcNKV5JBaelqL4zgo+iogvo pX6d4JkX0uyxWNjvQ4mo+0ODUvH3O5LxCGR65Nzis0Vtea9eij+TMhotBJ2CmuA2+FMaxk gCcoVIUc+RJN/6iD33IJGZgLlrWIUX0+78rPEK7kCdeW3U87NXYde5YxzfTRpW/4jt59bb U8azqAvL9oBOGBSjUt03gTGm0sXg0aQ9iIYypvwmqeOYkuYWtOQ9o2vNFx8lphEJpTmX1s 08lFxkmrxpQpisMCURqNSsKjYdhf2PQuYxTeeQRFEzf6Ega/pCSAH9IoIgESxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691711732; a=rsa-sha256; cv=none; b=uxdPR0ZyH6CLpoBVbBa3z8iguZlCwtJcuLYwSa7M0KTGmtA3X8VtxagHBo5eCT1Mq43e8O ZtuoMzGOyBU6ZzEA2uipAaBJvDJeKicqbuxcUe6JFj/7xvamqwjIv/9VzdMfxKMs2PAFTD cCxrnZeTRlAsKOmw/cxnmMJNEfoX6Z4xn68bSxfv+BCLFEoWyxIEoLz8Mv3R9PzC0me78D Qe8paDHVDKziVjJAPCSOtrFc7GzTTkxCbV0m+Y6yKJZmTVnLRndjJdOeKxTKbcmQ3BjhFR sZvOHmFhMAyQ+IHdFkRCp/X/FHjhauwR6QFb0Fdl91u1WLm5wWL1zCZc9LgC6A== 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 4RMP1v6jMbz2jb; Thu, 10 Aug 2023 23:55: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 37ANtVg7074916; Thu, 10 Aug 2023 23:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ANtVE7074912; Thu, 10 Aug 2023 23:55:31 GMT (envelope-from git) Date: Thu, 10 Aug 2023 23:55:31 GMT Message-Id: <202308102355.37ANtVE7074912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 8aaa12308992 - main - Makefile.libcompat: Fix DTRACE variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aaa1230899239a90f35e73436377a6f5f79bbf9 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8aaa1230899239a90f35e73436377a6f5f79bbf9 commit 8aaa1230899239a90f35e73436377a6f5f79bbf9 Author: Jessica Clarke AuthorDate: 2023-08-10 23:48:01 +0000 Commit: Jessica Clarke CommitDate: 2023-08-10 23:48:01 +0000 Makefile.libcompat: Fix DTRACE variable Back when Makefile.lib32 was turned into Makefile.libcompat, a typo was introduced; it should have been LIBCOMPATDTRACE, but instead gained a dollar sign in it as LIB$COMPATDTRACE (and with COMPATDTRACE not being defined, was equivalent to ${LIB:U${DTRACE}}). This then meant it was not converted to LIB${_LIBCOMPAT}DTRACE in 91d7edd549f5 ("Generalise libcompat to be a list rather than a single option") and instead left broken. Belatedly fix this long-standing seemingly-inconsequential bug. Fixes: dba75e9fa5a9 ("Move Makefile.lib32 to Makefile.libcompat and generalize it.") --- Makefile.libcompat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index da9c326756aa..c4a98773f1bd 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -20,7 +20,7 @@ LIB${_LIBCOMPAT}WMAKEENV+= \ LIBDIR=/usr/lib${libcompat} \ SHLIBDIR=/usr/lib${libcompat} \ LIBDATADIR=/usr/lib${libcompat} \ - DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}" + DTRACE="${LIB${_LIBCOMPAT}DTRACE:U${DTRACE}}" .if ${MK_META_MODE} != "no" # Don't rebuild build-tools targets during normal build. LIB${_LIBCOMPAT}WMAKEENV+= BUILD_TOOLS_META=.NOMETA