From nobody Tue Jul 8 14:32:16 2025 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 4bc3Tr41m3z614nx; Tue, 08 Jul 2025 14:32:16 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tr1b10z49L3; Tue, 08 Jul 2025 14:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985136; 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=3V1NBLT5v8sQwIQKYxLokBcxbB1UzjgSQ9ZgYOgokc0=; b=XZi3fNmpT3kL41F0MvsWP4inquxRteSM5OwLBUDR+z+u7Wjc7sZH9GSUQxcR+FfGdbK+rE CDaVDpfBME8FzQr3i+3R5VPkwJ+PLYZEKMui2LG8LaN9sh8iDvCRGYBhy8suxHxA6ikQIb yaxz4tFgO9PkguMtZWYGechGXENheGXKq8IU4wnv2uoc+IJLAtBdi8jUY2ukn1Fo38sex8 8bmyoHxRrzPUwQgtgYwVEvFTR2zaBNexD/XogCHXWkJbw+BpcgCg20146msz0OFAbMCAHk /LUZm5rWMbIWLArqFf9SnmRIPD2yDfq39MQEenvw5tIOdjHglwC6z/p33SkF1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985136; 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=3V1NBLT5v8sQwIQKYxLokBcxbB1UzjgSQ9ZgYOgokc0=; b=ElIUDOcXP5pEjwtanM7ndcRw4B4JZfzOaeq/hQswoyKFwslrcuhr0pv+T/q7oMsAX6lBgH scaLaEzB6XDYk/Xg6rlJgDdDZg01gUk84ZzMchDXURlHsbgfs6onDxtMNTga69bUflCMpC mzo990vRC0lEKjWrFFza2aZp63NaaFNirco7BHiq0BdrwjI6mRgFNcejcWqgp05b5NjtrL wfVai3N3ACkpbvgks+kA21ZYP9oNKidU7bqozgu4slK26v1uawVugCsfcnAM/Xs0bnLAUK lN5WzOSX1ckjOAti3RbEySftqifdD0eHOHSPjWjKV2hCeGr0Pb3j3wOI6QbWYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985136; a=rsa-sha256; cv=none; b=s9xYyaV5sirKgOSBezgsxG33X7VjX4gsNA9vDRY4J90f/yDDb9ZIn0WQaZeavFSm0HvMUZ YsZ5Cwwd2J5Z9UREYtJCt/AUV0aCRc1ucvj7ySn/Gxjy3ZM2sFHaWFINjDM6YNKv2MKBfI EUPmcAF0xr8erf38ueLny+OnCNl15StM6+XTMNB5F+gSLaXpxR5NdA7lGNCtxT7WhDDYyc D6PVocM2DMv85NTOuxNuIfVEKFqHDmpJIGZUaS1+kToB8SH+DB+mprC+o+PlZ0U3bo5DkB r7q1+sTRM4moyXs1WoZgwUybv5J16dk1EIHvnjEWNAmYjx/F4eCOGS6LJEh0oQ== 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 4bc3Tr17RSzgxJ; Tue, 08 Jul 2025 14:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 568EWGHp072165; Tue, 8 Jul 2025 14:32:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWGE5072162; Tue, 8 Jul 2025 14:32:16 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:16 GMT Message-Id: <202507081432.568EWGE5072162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 96c10cda41ee - stable/14 - flua: fix buildworld from a clean room 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 96c10cda41eee13182d1ac8b9e0842e5244711bf Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=96c10cda41eee13182d1ac8b9e0842e5244711bf commit 96c10cda41eee13182d1ac8b9e0842e5244711bf Author: Baptiste Daroussin AuthorDate: 2024-09-07 11:25:43 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:25:44 +0000 flua: fix buildworld from a clean room now that the flua ucl module is built the lib directory, it is being build at a moment where it cannot link yet to libucl, push libucl in the _prebuild_libs to ensure it is present in a path to be linked against at the time the lua ucl module is being built. While here, remove libucl from boostrap as a dependence of flua as it is not needed anymore now that flua ucl module is dynamically loadable. --- Makefile.inc1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d218ee62e697..656f2df9c9f8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2456,8 +2456,8 @@ ${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} # 13.0-CURRENT cycle, thus needs to be built on -older releases and stable # branches. .if ${BOOTSTRAPPING} < 1300059 -${_bt}-libexec/flua: ${_bt}-lib/liblua ${_bt}-lib/libucl -_flua= lib/liblua lib/libucl libexec/flua +${_bt}-libexec/flua: ${_bt}-lib/liblua +_flua= lib/liblua libexec/flua .endif # r245440 mtree -N support added @@ -3178,7 +3178,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ lib/libxo \ ${_secure_lib_libcrypto} ${_secure_lib_libssl} \ - ${_lib_libldns} ${_secure_lib_libssh} + ${_lib_libldns} ${_secure_lib_libssh} \ + lib/libucl .if ${MK_DIALOG} != "no" _prebuild_libs+= gnu/lib/libdialog