From nobody Wed Jan 24 05:01:01 2024 X-Original-To: dev-commits-src-all@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 4TKWxp1gy5z57S6Z; Wed, 24 Jan 2024 05: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 4TKWxp1BMDz4YD2; Wed, 24 Jan 2024 05: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=1706072462; 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=hE2/9ppCWqVhaQJLTs6snL19Ku+/Kr2MOSOZPtAk/Ps=; b=R7egcurSZvpRPjWP5xQaKV1TqDFUF+Qk0JRzn6AUN/PmXgJ5XpmzcvuXyZ36sCfnm68N6i ELXU24KR5jLBKSI4/A+5YI6zQoq1QfqzfD7qfIvE2BiE0TKaBQFOg4iFki5g1tDl18ujL6 CvE+r70K0e+j0O64TxSMEBqGwFXECZtio2IoQcm8g1eX3GI1gqcjAy3nCSjdQlYjtQTsyT SQJjWZPASN0l/0iTVFi2+6PKaTOV0JvlwwAoI0HcU9omLFkbtXqWuPvB2yw9GMFesnIgac K2RxOayMbJv9tTP7l9+6cwDbcTAdlCZ2CFGzgyLgRNioAVTGtaisOmkLLKYP1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706072462; 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=hE2/9ppCWqVhaQJLTs6snL19Ku+/Kr2MOSOZPtAk/Ps=; b=w2BQ6SNVYT7KX5aTXl+h8SWlZOIIE9093LtJsAOvAsdBVeW7ZuT/kWPUfu8s9ArjcHD1NQ ghsJzyQrYE+ZMsWWairwu/5wciATF75CvbciJ9gCCbut1D2ZYIgWPazE2BZoVu5JaYrw37 x8jO+ec6o1yQWxe5eNXeEfMIH/g7LB81r6VYUAPsCJ3sXNKY3xcYfkn5KuwL808fLQ5l4d khD8FmehFqth6w/qDKfM9lfPO18EyftEcpnQM6/8RtNLVBo+Fj2tJIXGvE3aDdtaX6bEYy 5s//ooBSPhbO+DPoC1edg+CiMPMOsS1q2aVd2r5JLzW4bfzDKkmNFvUNbdxIjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706072462; a=rsa-sha256; cv=none; b=gcsf43gisg78m3Cn5QKTjBCWda9s8qIMyQlGP/ylZcdgqu5lL+47SQ0me5RNWe531JQucF LdKDobTeKZfxlKX9/0/oL2OFsJ9DLfC5dVkvPl74EKrGQMmhPiy+h2w6216R4nN5KJphot 6hYrrpli4C5ka99doOjGUQaM2OMqWIwwdq5+08nfUmj3GgyV2Iq9ACl3/cruPb3SSQVMoQ sZdjzG5epxdqFYT/x66pFJezvtcQvcRPOF0wtCErGpmfHOqjQOsSQVl1c+gu9uv1pi4zo4 SBnEa4m21nPrV3+eyYyreXF4XhLhEfDeMiQScCC4vDqhf86MzplxITJMKADghw== 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 4TKWxp0FTsz115G; Wed, 24 Jan 2024 05: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 40O511SP018800; Wed, 24 Jan 2024 05:01:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O511ik018797; Wed, 24 Jan 2024 05:01:01 GMT (envelope-from git) Date: Wed, 24 Jan 2024 05:01:01 GMT Message-Id: <202401240501.40O511ik018797@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: 009db0d40c6a - main - ncurses: serialize the tinfo build a little bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 009db0d40c6acffe0b9d835cb15a75cc3361173b Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=009db0d40c6acffe0b9d835cb15a75cc3361173b commit 009db0d40c6acffe0b9d835cb15a75cc3361173b Author: Kyle Evans AuthorDate: 2024-01-24 05:00:36 +0000 Commit: Kyle Evans CommitDate: 2024-01-24 05:00:36 +0000 ncurses: serialize the tinfo build a little bit Move ncurses_dll.h to GENHDRS to start with; it's been generated from ncurses_dll.h.in for years, so it's not actually in a different category than all of the other GENHDRS. Slap an .ORDER on it to ensure that we build ncurses_dll.h and curses.h before any *.c gets compiled. This should sufficiently address a build race seen downstream where ncurses_dll.h is present but not yet populated. Reviewed by: bapt Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D43540 --- lib/ncurses/tinfo/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index c1ea75d3aacd..a0b191f50785 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -74,6 +74,7 @@ GENHDRS= \ hashsize.h \ init_keytry.h \ ncurses_def.h \ + ncurses_dll.h \ nomacros.h \ parametrized.h \ term.h \ @@ -170,9 +171,8 @@ CWARNFLAGS.comp_parse.c= ${NO_WUNUSED_BUT_SET_VARIABLE} CWARNFLAGS.read_entry.c= ${NO_WUNUSED_BUT_SET_VARIABLE} # Installed -HEADERS= curses.h term.h termcap.h unctrl.h -SRCHDRS= ncurses_dll.h -CLEANFILES+= ncurses_dll.h +HEADERS= curses.h ncurses_dll.h term.h termcap.h unctrl.h +SRCHDRS= INCS= ${HEADERS} ${SRCHDRS} INCSLINKS= curses.h ${INCLUDEDIR}/ncurses.h @@ -214,6 +214,14 @@ FILESGROUPS= DOCS # Generated source .ORDER: names.c codes.c +# Serialize the build just a little bit; there's nothing stopping the build from +# proceeding before ncurses_dll.h and curses.h are actually generated on a clean +# build since we have no dependency information to prevent it. +.ORDER: ncurses_dll.h curses.h +.for f in ${SRCS:M*.c} +.ORDER: curses.h ${f} +.endfor + names.c: MKnames.awk ${AWK} -f ${NCURSES_DIR}/ncurses/tinfo/MKnames.awk bigstrings=${USE_BIG_STRINGS} ${NCURSES_DIR}/include/Caps > names.c