From nobody Tue Apr 16 21:14:39 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 4VJxcw0dSPz5H5pM; Tue, 16 Apr 2024 21:14: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 4VJxcw04P7z4Qlw; Tue, 16 Apr 2024 21:14:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713302080; 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=AQRHi1xV44h6mclEjOBTtS9h+hnTO0pxbH3ZCKdCzwo=; b=OTyQ9+ppVG+kNDYg7t1PSHW4ZLkD8cfw6LR4Tpnt34lwyS249zaUuDhjV6UkTjiS5V7nCj xCqMhSl+HCNGNfPPV9ZMPk0Uyv5BKzoyoYEDdusZ+ryxxZmDcb8JaD3FdLkgtylbZexxVU wCwhEa0K98otC11dcExDB/DDJucsUYPzcseS8XC5cY0dy78ghpcQNOB15PpGJRl2Z9eETi IBI/kC8rTqFKk/RfBxumBq3475siwnZHULmhAgm8f+BK7VcJfgKGFdwzDIHj5nTa3vGR9s uRO71bPHHRqSw1vvsunw/Cfyzlx/G3qJjIvhW0iAI+TwvB7i89Iy9O4tABwUIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713302080; a=rsa-sha256; cv=none; b=XlAqMrk+vM1VZCrTPPQTaqvv0T2R5BhORspE506fMrB+9cNePlyK1hQ8l2drg/4ZE4iRB4 U5QM/w1tozfrqErksxF36uk5gOQkMmXRlxwkXuKhWUY0m4waMJwEo5QP93njmqEzAzJIBA 6lVsZ+3kboX4XC7/nDyW7UTKiOXFmqyxQlsN/qEExZs4ZE3CnNJUMEImADxcR4rRfkiV1E lnNdTd5kV3CucfQjvfDMkdyRHkDvdFcNzJk9JREdpLThbr+GDdjQxHtDlUlwjqQI1NepXp nSVJt1zkyJOyAE8sFFxC2uo/1Yt5s9RB3IdEANnaO+bDIjLAmVNbR32Prr4IRA== 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=1713302080; 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=AQRHi1xV44h6mclEjOBTtS9h+hnTO0pxbH3ZCKdCzwo=; b=lINW9rfiNZimS55E+vpy+lY8CJ6LmYrxkL5id3MfbJ2GNZnzvUhsdiMSIitEzlM9H9PiVe FaWUYfdi3gX/eUoI8COrafCdyoRAmpTpHJjEdTpuPfigE+y9YYobD6CT5oqwJ+yCb4zJaS tutdqMoWw/kr7dXL6LW06XrqWSkF9NU4AXVD+49RqXbEGumMoiuIiM/zzZJNOpF6BpiXti TNCjKcC6LOm10k0+rRNKIDkuAbZkRR0BQtv7T6YjCW/A0MUvdNr3UOpJ0tBlYexKwF2UQp KgNfKAnmZd4fOHDjFsER3rxZzNJ6AeSnw18vXzgBglp3fgt6Jo/4hyp7mCKa6g== 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 4VJxcv6hWTz1077; Tue, 16 Apr 2024 21:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43GLEd6O043579; Tue, 16 Apr 2024 21:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GLEdd5043576; Tue, 16 Apr 2024 21:14:39 GMT (envelope-from git) Date: Tue, 16 Apr 2024 21:14:39 GMT Message-Id: <202404162114.43GLEdd5043576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0dd2f4a0cca9 - main - libc: only export hesiod symbols when enabled 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dd2f4a0cca9332784d6a233dee8d211517fe7ba Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0dd2f4a0cca9332784d6a233dee8d211517fe7ba commit 0dd2f4a0cca9332784d6a233dee8d211517fe7ba Author: Brooks Davis AuthorDate: 2024-04-16 17:00:54 +0000 Commit: Brooks Davis CommitDate: 2024-04-16 21:14:20 +0000 libc: only export hesiod symbols when enabled Create a seperate symbol file for hesiod and conditionally include it. This allows linkage with --no-undefined-version. Differential Revision: https://reviews.freebsd.org/D44184 --- lib/libc/net/Makefile.inc | 1 + lib/libc/net/Symbol.hesiod.map | 12 ++++++++++++ lib/libc/net/Symbol.map | 10 ---------- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index 1305500176a3..cd4ccaefac92 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -168,6 +168,7 @@ MLINKS+=sourcefilter.3 setipv4sourcefilter.3 \ .if ${MK_HESIOD} != "no" SRCS+= hesiod.c +SYM_MAPS+=${LIBC_SRCTOP}/net/Symbol.hesiod.map MAN+= hesiod.3 MLINKS+=hesiod.3 hesiod_init.3 \ hesiod.3 hesiod_resolve.3 \ diff --git a/lib/libc/net/Symbol.hesiod.map b/lib/libc/net/Symbol.hesiod.map new file mode 100644 index 000000000000..bb020c969ee9 --- /dev/null +++ b/lib/libc/net/Symbol.hesiod.map @@ -0,0 +1,12 @@ +FBSD_1.0 { + hesiod_init; + hesiod_end; + hesiod_to_bind; + hesiod_resolve; + hesiod_free_list; + hes_init; + hes_to_bind; + hes_resolve; + hes_error; + hes_free; +}; diff --git a/lib/libc/net/Symbol.map b/lib/libc/net/Symbol.map index 4831868c0e55..454ce8486986 100644 --- a/lib/libc/net/Symbol.map +++ b/lib/libc/net/Symbol.map @@ -54,16 +54,6 @@ FBSD_1.0 { endservent; getservent; getservent_r; - hesiod_init; - hesiod_end; - hesiod_to_bind; - hesiod_resolve; - hesiod_free_list; - hes_init; - hes_to_bind; - hes_resolve; - hes_error; - hes_free; htonl; htons; ntohl;