jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 04:22:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

flua: fix buildworld from a clean room

Browse Source 
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.
This commit is contained in:
Baptiste Daroussin 2024-09-07 13:25:43 +02:00
parent 7a6309fdc7
commit 5daafa2c23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.inc1
View File

@ -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