git: 8918a2875e06 - stable/13 - Apply only the libadd/libnames part of dbf05458e3bd

The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=8918a2875e06d3da558b2b62e1506f412791d852

commit 8918a2875e06d3da558b2b62e1506f412791d852
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2021-12-13 21:23:44 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-12-13 21:23:44 +0000

    Apply only the libadd/libnames part of dbf05458e3bd
    
    Add libz to the dependencies for libdwarf. Otherwise, building older
    branches on recent -CURRENT might fail in the cross-tools stage with:
    
    ld: error: undefined symbol: uncompress
    >>> referenced by libdwarf_elf_init.c:233 (/usr/src/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c:233)
    >>>               libdwarf_elf_init.o:(_dwarf_elf_init) in archive /usr/lib/libdwarf.a
    
    Direct commit to stable/13, since dbf05458e3bd has other libdwarf
    changes to support compressed ELF sections, which are more intrusive.
---
 lib/libdwarf/Makefile    | 2 +-
 share/mk/src.libnames.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libdwarf/Makefile b/lib/libdwarf/Makefile
index 03f40cdd85ee..a3ef95b2572a 100644
--- a/lib/libdwarf/Makefile
+++ b/lib/libdwarf/Makefile
@@ -98,7 +98,7 @@ sys/elf32.h sys/elf64.h sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
 	mkdir -p ${.OBJDIR}/sys
 	ln -sf ${.ALLSRC} ${.TARGET}
 
-LIBADD+=	elf
+LIBADD+=	elf z
 
 SHLIB_MAJOR=	4
 
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index ae28000ca7f6..d1d8b60c51fe 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -326,7 +326,7 @@ _DP_fetch=	ssl crypto
 _DP_fetch=	md
 .endif
 _DP_execinfo=	elf
-_DP_dwarf=	elf
+_DP_dwarf=	elf z
 _DP_dpv=	dialog figpar util ncursesw
 _DP_dialog=	ncursesw m
 _DP_cuse=	pthread