From nobody Mon Dec 13 21:35:39 2021 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 24D0118F298D; Mon, 13 Dec 2021 21:35:40 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCZYl6NJwz3nmn; Mon, 13 Dec 2021 21:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B6BBF1BFE6; Mon, 13 Dec 2021 21:35:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BDLZdqe057606; Mon, 13 Dec 2021 21:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDLZd23057605; Mon, 13 Dec 2021 21:35:39 GMT (envelope-from git) Date: Mon, 13 Dec 2021 21:35:39 GMT Message-Id: <202112132135.1BDLZd23057605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8918a2875e06 - stable/13 - Apply only the libadd/libnames part of dbf05458e3bd 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8918a2875e06d3da558b2b62e1506f412791d852 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639431339; 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=vZNi75HLfRidO31aktKR3bxhZn0CUACxxmC7RVGFZTA=; b=jF69Bb/lvJKyujqbZsKt2vlcF/Goa0b2efDili2EHPaJePPdXXvRM2AaXKU9ylbHE4L/JE rGb/r3S6Z8/Er/mGmOtZMJHzPO2B2MesqmsH+8ErXZhLECp66YLmIBtm7GlKHf32GPIhYi j3j0cxpsBk9PWgKalGx7fgUOo849FPqqyIyupRlKuTK6UtRr5FCyYcbNVW/OINEnEtirp+ ROZz/E5qFtvYOQGWD2j2grUdaGpQuHOveEUjNo7zGwiHB08IXZo/etq7Haba+h7Gbh4uoh 2y+oL3PDyjjRhOXNOEXapymDPy4trOuemLM6HsPheGKCDH+43urArAjv1CWbFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639431339; a=rsa-sha256; cv=none; b=EdLUJlp4F2JqgBYDHMIyb3mWBRWGOSwC8akW9HDC25feWlEdm1SxkJhvIhV7MN2VkU+s8L S9mLpYkv5xPdhFns64R1oQkvqP9oV5Xlrqy1LUhRMXVpHkDbcymOFKX4vV193xrg0XeBMJ SRWRFSdXZaARMIobk3o0HjCRNNoWcy00JkdV+oKTCOp9rj1nNRE8eaWtE3Ayf+PUHpE+hC FdmX2quO3lzJg1/pH5kBbZbrouO0WUA6OOT6UZhNu9uNxD/U+iY8UJfRJXeHS5zPXUMV9u OW3NnL8mXxtRcg7vTPHLoDC0OANAiJm2/l68r8ytVXkTwhbjDwsK/DpsATz2Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8918a2875e06d3da558b2b62e1506f412791d852 commit 8918a2875e06d3da558b2b62e1506f412791d852 Author: Dimitry Andric AuthorDate: 2021-12-13 21:23:44 +0000 Commit: Dimitry Andric 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