From nobody Sat Sep 07 11:31: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 4X19sh5rh9z5VXCm; Sat, 07 Sep 2024 11:31:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X19sh5MnJz4l3h; Sat, 7 Sep 2024 11:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725708696; 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=dtBkrMKcKPNanB5NobYpyiLnf5bLlnqsRChUVWv4riU=; b=Wm/XBBsnYx9wSj/uHFMgJSR+ljzoFr/oa4SBDseqp/NCnyYHWbZ7ZdOnsCEmHP9Kyl9Okg i+onOtnvQ6mdrqhkU673/VTFDCTywEKCkHBeNz0NnLZ/x3+HrgMqARU8Vyph/AMuF+O5co sBK/vMj98PCJprZ18/82JBnTPdVPGUnFVRkJufCpUYtP5Gry9zY85dn/nXGNxcPk8Lf7VE lVSjpCbcYg5YYorvnl2n4vGcDA+pWdvaLHd3qjJibeG/PGXWJjHoOJBZQxyettVrIj26zY CzGvzmdAOJN6c3D93O6u6KGREMzr+Amje/PyKDkSyLECKTUGf4bWJz4712MgHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725708696; a=rsa-sha256; cv=none; b=f7KNigi0ISE/P6W9lCcq324XSCQpw+4g4Qm/tY28yNnqCXffoWE/+BRG4em2XV87boMWJe k6aok8OHDUcSayCuNGqUvtVaLi/LdoQat2VHhJUrgT5CCTBq/tLc3FQpV3jZZIf5maQBO5 5DHno/PPRiI8TnaAmY1Ph+YZkHA5lXq96bdxxZ1QFZQXEbPhpMqLN90M3FQGjlgmZ9SO/E UR1lesF/Qs+SSPxT1nJa+NNtYc6tiqSJQqSMBsrvVvLjDK1Kie/sHagIB+2jmNtc/2pe7R aidWEggqhd/fSV6vmpmZZqORnMy2GIMCzAI6xxzm6gq0pC7zo6771IQwZOi6bQ== 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=1725708696; 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=dtBkrMKcKPNanB5NobYpyiLnf5bLlnqsRChUVWv4riU=; b=kdvsAondYFnfUUH74F0vBZw8gkFOoE/6D1HnQlBevVbhBcnZyRFCanzC9OwI+/GKkjOW6z v0/U04GPmKfjgRSK0Eg+crvlITpSblUphsTqdMsuQ4CxHmIBoj2qSG5ogfeN2PN+HOKoF9 dQmsTaqrDJDG6OgFl3DK3VIgTupJ1cZ+EjABUfJj4UBf1INDGAWUXr4s1MiCYfwtActfSQ GqN9EMGtNHf0csYn4eY2Slca8l7dxlT9QV0AckPXg698iWI5efu2Mq9BesZqwGbSNIYK7a I9h08k9x7Gykfs3b3qF+1K/qk35eW3oGLqJvXpfcKIKYGqBmo0epqwWl13ly8Q== 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 4X19sh4zQnzZM6; Sat, 7 Sep 2024 11:31:36 +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 487BVaK8042104; Sat, 7 Sep 2024 11:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 487BVaDL042101; Sat, 7 Sep 2024 11:31:36 GMT (envelope-from git) Date: Sat, 7 Sep 2024 11:31:36 GMT Message-Id: <202409071131.487BVaDL042101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5daafa2c2301 - main - flua: fix buildworld from a clean room 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5daafa2c2301ad6d5ee0ade9a31ac2c463694a21 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5daafa2c2301ad6d5ee0ade9a31ac2c463694a21 commit 5daafa2c2301ad6d5ee0ade9a31ac2c463694a21 Author: Baptiste Daroussin AuthorDate: 2024-09-07 11:25:43 +0000 Commit: Baptiste Daroussin CommitDate: 2024-09-07 11:25:43 +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 a4e2889004b7..edff60cc17ac 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2513,8 +2513,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 @@ -3236,7 +3236,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