From nobody Tue Sep 12 21:01:02 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 4RlbbL6vH5z4svkn; Tue, 12 Sep 2023 21:01:02 +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 4RlbbL6Th9z3Yh6; Tue, 12 Sep 2023 21:01:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694552462; 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=T5a3rh/IeZZhvSf0Ff96CoG8tSxP0Ph75/s2sg5DcQc=; b=Ng+M9FTN9NdJrzOfan2OVIl1aDl9euELdnmL81bP9KnzqlnObdX0/VTsob/T7NsZowGBB6 ro1X/KLoRDTg3mw2+xzFklie97TxY6V4WSvqodbbkNfDjWoyrZAS9vDOUaKcJ1nCVG2fbi Wz3UT9cJLILRg/C4tWM+dBhrc+85LAEik9YCPa1abP43VOOAwcanakBcPejcznSt7DAZ8a Vcs5CYL06b5SkxDGg5yVEpvucSzz70v343jpPKDZKgpVkYCJkqH36YhGw4v08qt66UI9on +VAw2JN7GsJQG8gsOjP65V2OF178TDlarrGkYc60CqL8HHBvAIwGcppRiUbvTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694552462; a=rsa-sha256; cv=none; b=YmxVh6VYPXqg3bw6U+JQ/dDlFkQ1sYGta3VgntiYMrdkNBMhNScqxlQQ/mqUsDvJNvkh5h nZhhCzh2IVCqrP+Oh5OqlzFE3GA448tBaue0l1RGHJyAQpdMPRUibYn8XpSagVc9owUpaV lDdYm3ef0Mbc0NAnJnS6VtezaEBK+mqrKOxO8ajOrjCmkGTk+VWR/1BDcSNcYyL4LaXJu4 FU72LyZHgP23Dv9ZyEJp+ndieXhXpuUrL6CIOfAvmcN3UaWgQamN3hi3jetRlhEuaTnaQW qYC9GbcdVWtA70WJ2ONd7Rgj2sUf6OqcLurso39LhmFd8y2Viza63I/iUivB5w== 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=1694552462; 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=T5a3rh/IeZZhvSf0Ff96CoG8tSxP0Ph75/s2sg5DcQc=; b=rTT0wB4Tq/QZADo6x1iUd+O2zFqxtA1qT4VXkEYUt5LQ3gTmhCAmv1irnUVca3iP35Wr5F Jd0hTb1ufWDc9cIe270l0aqu1lsDxuK6LwV69zAkgNp1+RGxr3GdW2qAEtgVEw12rcv7cu VK5YXas3fi2AlCuWOLKofj+JXlrzzA1qUzmNudi/BO1gmxzKwpIVd4VkGV5wQESaYsEz0h aJW3MXosItQg7VlLRuwk7wUyLAVZig3Hf4SApWy+Ux5DFSBGIZl0flNe4Sr1Pr1yZNBPdJ rHmv7B9sWOSdRfpUtL7N+NlvDna0PcZoPtfGmdEhIhlFmCKc6G+78rizC/8Kqg== 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 4RlbbL5XCNznCv; Tue, 12 Sep 2023 21:01:02 +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 38CL12gw099180; Tue, 12 Sep 2023 21:01:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38CL12V4099177; Tue, 12 Sep 2023 21:01:02 GMT (envelope-from git) Date: Tue, 12 Sep 2023 21:01:02 GMT Message-Id: <202309122101.38CL12V4099177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: c086d1cbc3d1 - main - ncurses: avoid hardcoded assumptions about the layout of .OBJDIR 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c086d1cbc3d13967c031e6420831349967dbcfa2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c086d1cbc3d13967c031e6420831349967dbcfa2 commit c086d1cbc3d13967c031e6420831349967dbcfa2 Author: Kyle Evans AuthorDate: 2023-09-12 21:00:45 +0000 Commit: Kyle Evans CommitDate: 2023-09-12 21:00:45 +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. Differential Revision: https://reviews.freebsd.org/D41834 --- 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