From nobody Thu Mar 21 18:56:36 2024 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 4V0vnd12mYz5FH5c; Thu, 21 Mar 2024 18:56:37 +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 4V0vnc6cN1z4GNK; Thu, 21 Mar 2024 18:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711047396; 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=y0y2VgJhRcltJlqF/4j/mPnvoKxN85DB9TbIx+HuW2E=; b=qSgOjyOO5JOYal2uO1Xkw+Y4qUfkGh9gqWeKaWMiyLtZo3fG0dFJtw26Cs0qNBOdc9Gtmx dkghoxx10hP1X9an974qSNxGJNPjCkDf7RYbi4TmF3JuKueqpi0GWCFcGFeW/6ZBVmyihM nuaAsrEkkYjHaoQbUZTjUWNgkIA6UEqQ+qCfTgrgVWbWpk/PKMyODawfKCNS3tfl8ulH2M rGDR3yrwTtSbpJVhmG4ben5Y1SopQAdB5sHsEJ3cqfWR8q9XTrzS1B7qtq6/mOQzebCgI1 qNujb4AEUGtxHGHeUuGfxeFQBz9ApSxCA0KeTL1C6Yl6efZxkEFnMzI4yH2VNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711047396; a=rsa-sha256; cv=none; b=I2+zQIWSVdQoBESFAevYlBMzKSBpVwtmVXTP/8BgHNEPVh/+HDdkg/Z9wEvqu2ZBMzWCuM U4HXYfnm3pTIwkYZ4ad9WI4ZVtYwdy359ZdhquVuF0QhBn2TaQUTTH6ubZNDg6lSU2fe5M SQ9rsGPDwquUaNq5MxYDw0cHYG/6bznxEvZW+98T8qVgmZCPpleUTwuqt1LZSDVo1MpsKg MI2bNBZcnhJ09MNSyOglLN1NfzKRtQQYmPynPke/PPmVQuhserNymK9lGcUDm0P/ifs/M8 dC2HvfqpT+hxZju84qlAYx6tTO3KyoWMpYpMt3FOg0rUmr+bQ62RseUg9eTOMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711047396; 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=y0y2VgJhRcltJlqF/4j/mPnvoKxN85DB9TbIx+HuW2E=; b=DIpTFEd9V1DYObrRX6Ky4TinrmbTcJxnGf7/5RDjPw80xdd9g2xRoYMdw6bwIoyP+c070J Ehqv/4UfFN56i8GYUv9CM25+jwIj84uxQIikLJKh2smozV4iICDThZtnETGf21GmYaFSIl jDN5QUDeQz0QUSx3++xCYQZmgcvagJBLFTAuZWOpfEZ9hRdmaXAlvgkej1f+sedcP+tuZ3 IpLlzesM/MSEvkfHPr9Im8NnZZojAJGoK2BLpT78eUxnUBVFQ6Bfd5r2K8lph76hBiiPuH WnhdvU2BaZvhB6aDYVrKRtbRF3/OQDGP6dWocW2xMAqU2/21PsYmr9CvSceQVQ== 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 4V0vnc6CjTznXP; Thu, 21 Mar 2024 18:56:36 +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 42LIuaUC009975; Thu, 21 Mar 2024 18:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42LIuawB009972; Thu, 21 Mar 2024 18:56:36 GMT (envelope-from git) Date: Thu, 21 Mar 2024 18:56:36 GMT Message-Id: <202403211856.42LIuawB009972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 139d114acc7b - main - libsysdecode use MKTABLES_INCLUDEDIR 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 139d114acc7b57a6cc839fe5ee935d25ecd9f3a2 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=139d114acc7b57a6cc839fe5ee935d25ecd9f3a2 commit 139d114acc7b57a6cc839fe5ee935d25ecd9f3a2 Author: Simon J. Gerraty AuthorDate: 2024-03-21 18:55:56 +0000 Commit: Simon J. Gerraty CommitDate: 2024-03-21 18:55:56 +0000 libsysdecode use MKTABLES_INCLUDEDIR We do not conflate SYSROOT with STAGE_ROOT/DESTDIR during DIRDEPS_BUILD Make sure mktables looks in the right place. Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D44415 --- lib/libsysdecode/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index 504701ee99a2..ccff95af741d 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -127,8 +127,13 @@ CFLAGS.gcc.ioctl.c+= -Wno-redundant-decls CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} DEPENDOBJS+= tables.h tables_linux.h +.if ${MK_DIRDEPS_BUILD} == "yes" +MKTABLES_INCLUDEDIR= ${STAGE_INCLUDEDIR} +.else +MKTABLES_INCLUDEDIR= ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} +.endif tables.h: mktables - sh ${.CURDIR}/mktables ${SYSROOT:U${DESTDIR}}${INCLUDEDIR} ${.TARGET} + sh ${.CURDIR}/mktables ${MKTABLES_INCLUDEDIR} ${.TARGET} tables_linux.h: mklinuxtables sh ${.CURDIR}/mklinuxtables ${SRCTOP}/sys ${.TARGET}