From nobody Fri Dec 15 16:50:54 2023 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 4SsFbM08B5z53nSm; Fri, 15 Dec 2023 16:50:55 +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 4SsFbL6QJLz4Zwc; Fri, 15 Dec 2023 16:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702659054; 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=1AfelgyNgmqtV9XZZQeSzMe1M+YVPmZNEtZ2zHR0CI4=; b=joXWyMtBn/LZlrl2N8GmDndJSmVj4iap0UbryN0qEwM9TqokLVg37QBNHMEbgG9ZsJ6Pds AHcye80aNhLNZMtkCN7wWBXdziYUYX1Lp+d7JqjKiq26FMmxck4/lRTAK1JpThr4r4yb4I 7csHHTtM0K6qA8g6baCHZb0dM/8VFr21vl/s0fUOoYhdPwFTr1uRHeUCfrewOu/0KIFDbf XyrWedTvgCEHfUFIF5l0jwjLk/RcSOKXCrMXNd66LhEJyHCUAj7iExQbrSU+37fiWGDrPP yL8Jh9S9cZ26LjOwHaDVQgP2KqYb0I7K/RZW0RSijFADoxMML7l2UsJI4Ipqxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702659054; a=rsa-sha256; cv=none; b=fp7+eQbp1qdpcmOEFdxTNRJH/B+mHOuvKYBVPOeUSaoziKtf+vTLV7456zp8m47n8Zuv0l inUuusgrBsfuNe15+o05X+bw6ttridDri5ceAYl5irjDWlNkzKQSDTu8GvQe4tLJZQ7ljE RES9lAD+ig3gAoudD5iQ/lpb7JG2DurUf9JHc+ORHHmCF23LmD2XY2mC6RXkLpLqTf2xvg fXzjdDRCzZdVz/dSzLzI6r/h7f48TONqWzfJZBwFBVAaQetdHkN/Lw+2jfPh3w5l1IbdYi pbM2M1lN2QNCEJD+2BwSZH6QNvRF0a/f9LXiKBIl32JPVjv/z9CexS5knvZ8iA== 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=1702659054; 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=1AfelgyNgmqtV9XZZQeSzMe1M+YVPmZNEtZ2zHR0CI4=; b=dFln+OO51qIByaNXOJtsnSeftwn88wFQ937Dybgk+ejmfolUg5ZYLks/yIMi3jFA2NrKIg idONXPXAohel8SPqikYMvl6jwTj4WTIO4hOgq1k9b7j1WjV2hKtQNfbLKoH+xC9BKl5T/K JjvePmM2gPcC9dpSHR8CIR+kSx1HqhoUd5r3SlB/5NuGCyS2mU80pD3d8VrkIsbdRfkVfV DSaMmYQ9Dk5LTRn0pgKO4go3GhNCdLHI8YEkxOEJtfJPUoVVQms9klJo4MJ22lvX+IvBKR oaX4K6Q5rbUKtRpFZDMPTqHnmrEOluyUpxlDgH6LzhKdMD/Cdbegy1FezBq15Q== 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 4SsFbL5Rm4z3wk; Fri, 15 Dec 2023 16:50:54 +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 3BFGosKw010760; Fri, 15 Dec 2023 16:50:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFGossR010757; Fri, 15 Dec 2023 16:50:54 GMT (envelope-from git) Date: Fri, 15 Dec 2023 16:50:54 GMT Message-Id: <202312151650.3BFGossR010757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 20baa89501c7 - stable/14 - ncurses: avoid hardcoded assumptions about the layout of .OBJDIR 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20baa89501c7a7815b5ca4ada916393732af8d42 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=20baa89501c7a7815b5ca4ada916393732af8d42 commit 20baa89501c7a7815b5ca4ada916393732af8d42 Author: Kyle Evans AuthorDate: 2023-09-12 21:00:45 +0000 Commit: Kyle Evans CommitDate: 2023-12-15 00:58:04 +0000 ncurses: avoid hardcoded assumptions about the layout of .OBJDIR Abstract out the details of the FreeBSD build into a $TINFO_OBJDIR that external builds can override if they orchestrate the build a bit differently and have a different objdir layout as a result. This makes the ncurses build a little bit more flexible without requiring weird backflips. Reviewed by: bapt, sjg Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. (cherry picked from commit c086d1cbc3d13967c031e6420831349967dbcfa2) --- lib/ncurses/config.mk | 6 ++++-- lib/ncurses/ncurses/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk index 0016dc97a72f..8a3e7d0ffa59 100644 --- a/lib/ncurses/config.mk +++ b/lib/ncurses/config.mk @@ -6,6 +6,8 @@ NCURSES_MAJOR= 6 NCURSES_MINOR= 2 NCURSES_PATCH= 20210220 +TINFO_OBJDIR?= ${.OBJDIR:H}/tinfo + CFLAGS+= -D_XOPEN_SOURCE_EXTENDED NCURSES_CFG_H= ${.CURDIR}/ncurses_cfg.h @@ -17,7 +19,7 @@ CFLAGS+= -I${.CURDIR:H}/ncurses CFLAGS+= -I${NCURSES_DIR}/include CFLAGS+= -I${NCURSES_DIR}/ncurses -CFLAGS+= -I${.OBJDIR:H}/tinfo/ +CFLAGS+= -I${TINFO_OBJDIR} CFLAGS+= -Wall @@ -27,7 +29,7 @@ CFLAGS+= -DHAVE_CONFIG_H # everyone needs this .PATH: ${NCURSES_DIR}/include -.PATH: ${.OBJDIR:H}/tinfo/ +.PATH: ${TINFO_OBJDIR} # tools and directories AWK?= awk diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index b52085780952..e1a3dbf61e49 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -180,9 +180,9 @@ libncursesw.ald: ${.CURDIR}/${STATIC_LDSCRIPT} -e 's,@@STATICLIB_SUFFIX@@,${_STATICLIB_SUFFIX},g' \ ${.ALLSRC} > ${.TARGET} -lib_gen.c: MKlib_gen.sh ${.OBJDIR:H}/tinfo/curses.h ncurses_dll.h +lib_gen.c: MKlib_gen.sh ${TINFO_OBJDIR}/curses.h ncurses_dll.h LC_ALL=C sh ${NCURSES_DIR}/ncurses/base/MKlib_gen.sh "${CPP:N${CCACHE_BIN}} ${CFLAGS}" \ - "${AWK}" generated < ${.OBJDIR:H}/tinfo/curses.h >$@ + "${AWK}" generated < ${TINFO_OBJDIR}/curses.h >$@ expanded.c: MKexpanded.sh sh ${NCURSES_DIR}/ncurses/tty/MKexpanded.sh "${CC:N${CCACHE_BIN}} -E" ${CFLAGS} >expanded.c