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

compile_et: reduce the dependency chain for bootstrap tools.
Some checks are pending
Cross-build Kernel / ${{ matrix.target_arch }} ${{ matrix.os }} (${{ matrix.compiler }}) (clang-14, /usr/lib/llvm-14/bin, ubuntu-22.04, bmake libarchive-dev clang-14 lld-14, amd64, amd64) (push) Waiting to run
Details
Cross-build Kernel / ${{ matrix.target_arch }} ${{ matrix.os }} (${{ matrix.compiler }}) (clang-14, /usr/lib/llvm-14/bin, ubuntu-22.04, bmake libarchive-dev clang-14 lld-14, arm64, aarch64) (push) Waiting to run
Details
Cross-build Kernel / ${{ matrix.target_arch }} ${{ matrix.os }} (${{ matrix.compiler }}) (clang-18, /opt/homebrew/opt/llvm@18/bin, macos-latest, bmake libarchive llvm@18, amd64, amd64) (push) Waiting to run
Details
Cross-build Kernel / ${{ matrix.target_arch }} ${{ matrix.os }} (${{ matrix.compiler }}) (clang-18, /opt/homebrew/opt/llvm@18/bin, macos-latest, bmake libarchive llvm@18, arm64, aarch64) (push) Waiting to run
Details
Cross-build Kernel / ${{ matrix.target_arch }} ${{ matrix.os }} (${{ matrix.compiler }}) (clang-18, /usr/lib/llvm-18/bin, ubuntu-24.04, bmake libarchive-dev clang-18 lld-18, amd64, amd64) (push) Waiting to run
Details
Cross-build Kernel / ${{ matrix.target_arch }} ${{ matrix.os }} (${{ matrix.compiler }}) (clang-18, /usr/lib/llvm-18/bin, ubuntu-24.04, bmake libarchive-dev clang-18 lld-18, arm64, aarch64) (push) Waiting to run
Details

Browse Source 
Fix the build on macOS

The bootstrap tools are statically linked, so our build system
will provide the full dependency chain which pulls in libcrypt.

since recently libcrypt.a is a linker script not supported by macOS
ar(1), given that compile_et does not use at all the function from
libroken which brings the dependency on libcrypt, bypass LIBADD
dependency chain by using the old LDADD/DPADD mechanism, like it is
done for other kerberos related bootstrap tools.
This commit is contained in:
Baptiste Daroussin 2024-11-06 12:16:09 +01:00
parent 3f6a34cafe
commit 4d692868a6
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/compile_et/Makefile
View File

@ -4,7 +4,18 @@ PACKAGE= kerberos
PROG= compile_et
SRCS= compile_et.c parse.y lex.l
LIBADD= roken vers
.if defined(BOOTSTRAPPING)
# compiler_et does not need the full libroken but just a bunch of the file
# in there, the buildsystem we have will trigger the full dependency chain
# when linking statically including libcrypt, which is a ldscript, not
# supported by macOS ar(1).
LIBROKEN_A= ${.OBJDIR:H:H}/kerberos5/lib/libroken/libroken.a
LDADD= ${LIBROKEN_A}
DPADD= ${LIBROKEN_A}
.else
LIBADD= roken
.endif
LIBADD+= vers
CFLAGS+=-I. -I${SRCTOP}/contrib/com_err
WARNS?= 0