From nobody Mon May 20 14:48:44 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 4VjgRw6ssgz5LQ1y; Mon, 20 May 2024 14:48:44 +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 4VjgRw6NF9z4dbb; Mon, 20 May 2024 14:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716216524; 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=cW8b7/zNaY55Dtpw5XngowMhmK8VQlL+SLfzWPJ7v4Q=; b=Fp+uDlZA8dzppz+DsR7EPU8x6CrwK43rFb/1KL0zE4Nc1oKJiJ1mVXV75ClPYHnR7lCbm6 X/ftG6cBAzv9lmsNULyU/I7cJ9QrN7fPkVNSLZkCg1SSNWY4WIJ8Ba9ZcLmtSYFHGOMNXg 2Rzsw24OBcoDilcYMYlQApTzB75Esm0plWL2/axCyowsZCeBY7d69+m+2vDR1W+DHGZeHs dvKltlBLZ98VSfJaZh+3y4qbJQweuqNDYdEE6BFVBz9BLQNBKd8JxidSR0OT8iCdqZk6jN 94wTWlY0p25fAOmyB47/W3XKFv9bUyYrjVDsqFedgCqjjnF4TFSVglOQcDQOAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716216524; a=rsa-sha256; cv=none; b=SDpk49kXWIVN2b3fMULGyu04uLn+lg4b3FKMEMlZ4f4OOK1SsYQVksCKbAMOStrfy8k6Q5 1mvrmS3ltKV+wbVH8w1Jh2Kx988Ag97FffFGBPuHMwcMWS081i/w40NbS831a3lBhIwO/I yeCFocK9pfBfJ4xAqtBMGLYhzrnjvN5uzTyBsDDTbjZ1NgwH7fzUWKtCdlTY5jnps4W8RQ fgOf5YJ7kaxKN/FDL7e9K6n7jfiqP1z94VQyA33LvRq2AKRd+LBiSrjv3cXFv/2cPDtdMJ oM+IskqYYD4PhUhGkBqhO/brG3FQk+duQ7HznDxCvqhp6IOV3GQwbAvtk7ZuXg== 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=1716216524; 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=cW8b7/zNaY55Dtpw5XngowMhmK8VQlL+SLfzWPJ7v4Q=; b=LRZTk22JeiD6t/RAmp0MUv8YOabz8iDhq3xK2VkR/uh14l9KbXkWy/1x1luUX5byDuOQ1n urAuQjeSXxBrbrb0zLA/MzofL0yX5TLqgWkOjr/mAjlppomGUp9hbgs39HTYfhGGJh+Lp2 9JYVb/jYLhsayp+/ASV31n9pAA79+fnfgXpEzSBPiXtivXFjihl4pmdf8rotP88SCU9gMj OQD93PbcB9D2OpvQ0aEHypsBaFwD7GJacECmyslglRFZL3Q8LRjjHhIS65bpE63RO7259r z0llzERz3V6gUK0grgxSLPC8I/IgSx2efVlFv8oJPBcgA/Wze/M8asl/JLfIeQ== 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 4VjgRw5cSszhwK; Mon, 20 May 2024 14:48:44 +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 44KEmiQ3066207; Mon, 20 May 2024 14:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44KEmio6066204; Mon, 20 May 2024 14:48:44 GMT (envelope-from git) Date: Mon, 20 May 2024 14:48:44 GMT Message-Id: <202405201448.44KEmio6066204@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: 6edb14c006f6 - main - Make WITHOUT_UNDEFINED_VERSION the default 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: 6edb14c006f6eafe1f31f54ce7fe2158321fa18d Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6edb14c006f6eafe1f31f54ce7fe2158321fa18d commit 6edb14c006f6eafe1f31f54ce7fe2158321fa18d Author: Brooks Davis AuthorDate: 2024-05-02 17:13:39 +0000 Commit: Brooks Davis CommitDate: 2024-05-20 14:40:19 +0000 Make WITHOUT_UNDEFINED_VERSION the default Link with --no-undefined-version by default. Will detect and prevent the accidental removal of symbols from versioned libraries. (cherry picked from commit 4510f2ca9170927309a423274e03f1eb8e27da27) This reverts commit b25ceb97eddcd58cfb2b433fe301ab28c678c249. Reviewed by: arichardson, kib, dim, emaste Differential Revision: https://reviews.freebsd.org/D44216 --- share/man/man5/src.conf.5 | 8 +++++--- share/mk/bsd.opts.mk | 4 ++-- tools/build/options/WITHOUT_UNDEFINED_VERSION | 2 -- tools/build/options/WITH_UNDEFINED_VERSION | 4 ++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index f3e45ca8a661..12f78e20085a 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1719,9 +1719,11 @@ and that the runtime support library is available Do not build .Xr unbound 8 and related programs. -.It Va WITHOUT_UNDEFINED_VERSION -Link libraries with --no-undefined-version to ensure all symbols are -provided. +.It Va WITH_UNDEFINED_VERSION +Link libraries with --undefined-version which permits version maps to +contain symbols that are not present in the library. +If this is necessicary to build a particular configuration, a bug is +present and the configuration should be reported. .It Va WITHOUT_UNIFIED_OBJDIR Use the historical object directory format for .Xr build 7 diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 38d53cc6bf30..65ae4f4cfa7c 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -68,7 +68,6 @@ __DEFAULT_YES_OPTIONS = \ SSP \ TESTS \ TOOLCHAIN \ - UNDEFINED_VERSION \ WARNS \ WERROR @@ -81,7 +80,8 @@ __DEFAULT_NO_OPTIONS = \ PROFILE \ RETPOLINE \ STALE_STAGED \ - UBSAN + UBSAN \ + UNDEFINED_VERSION __DEFAULT_DEPENDENT_OPTIONS = \ MAKE_CHECK_USE_SANDBOX/TESTS \ diff --git a/tools/build/options/WITHOUT_UNDEFINED_VERSION b/tools/build/options/WITHOUT_UNDEFINED_VERSION deleted file mode 100644 index 0e58eb00f3c1..000000000000 --- a/tools/build/options/WITHOUT_UNDEFINED_VERSION +++ /dev/null @@ -1,2 +0,0 @@ -Link libraries with --no-undefined-version to ensure all symbols are -provided. diff --git a/tools/build/options/WITH_UNDEFINED_VERSION b/tools/build/options/WITH_UNDEFINED_VERSION new file mode 100644 index 000000000000..71b048349a6f --- /dev/null +++ b/tools/build/options/WITH_UNDEFINED_VERSION @@ -0,0 +1,4 @@ +Link libraries with --undefined-version which permits version maps to +contain symbols that are not present in the library. +If this is necessicary to build a particular configuration, a bug is +present and the configuration should be reported.