From nobody Thu May 2 21:55:47 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 4VVnmz3qT7z5K6hV; Thu, 2 May 2024 21:55:47 +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 4VVnmz2twqz4BNM; Thu, 2 May 2024 21:55:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714686947; 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=Tg3Vi/Xd07gFmsR05ghV9jJSOa4CBkLq8khObuP4V3M=; b=qBN7kWSnjk2Ewno0FSBEIecA3aChhiLJM6Ya76AmewDY2PX9omqZj7Nxa5/ch906fpsX2K GwF1i2cqJ2Fc1bATYP2QPD2SdxloQTGUCk5lLqRedttjfDvdnenRJYKSapkWzPt2tKDJy/ HNKIxNrwrDowuY9FkkpTdUz0Aus6qADMAcfQDVsAGPL2mPn/q2ui01gDORFInJPBr/JrEh uOJaYObDACEow3H74cz8Vl3uAnTH7RhxK78DEmB7V4AorMymnOMuRy66D6Bt6Ca8KMrVXF dVmozf7OY8M+XxWKN6h+jtTEf1wRAL4ZqiBaxqBzd+Vr7OSXdaLW0p/fZ5gZlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714686947; a=rsa-sha256; cv=none; b=viNc9KX1426Cr2DQpx9xwSx9AblfDWcPBj7hWZBc6IKbPHMQl1751OV33mG0QMcAZRfhrE 0uNyVX3EX5qE/aoMeuAUfeXfcF+7i26toLsqZNa3pPDsF1YGgETBxJAdk+IgZhrwKPDD+/ EanVxSNMXpmGvW9HnDe2XaEdka8kAD7DQhY3el6di7MZuDIgYpacC8Qp0Mu6f4O+0a/+Y2 0ICOjJrEd0oxu1hTdVMSz8euGo7FZzaYRMEIMoL+DfxVpK2beKrclNsBdJYV50pAusFYuW KkqeeOXuLh3HCSso7MSvBpvtWvQmby23Ft/DwwSyvAycC5QbiJnwYNObSpGMxw== 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=1714686947; 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=Tg3Vi/Xd07gFmsR05ghV9jJSOa4CBkLq8khObuP4V3M=; b=cbBw133jlRux31fZmq63ZanSz6IkQE4482VSRgkmHWs9nMkoh/y/BL3EXTV2sjhPmuWO+4 oaxEMKcCSTHrPdUhzmi7cRcyqgCwgVrJ9iYpgMiRLtR7mqGongmZWOBGbjfaFEQ6TeVicg hNdpFbk7EzwpMCYXDvCtpFByHjjn8cabLoDl3+0s5x9IOP4cRtxuWn0291d/ZrDDwvxeVb 26uerEYJiaWpgsBAsQpr6GNx9WGxwmFAb0o4GRqyAcGofKPeamRCHooYi2T4p1Y/c5AaJ2 OcDfXXh6UNIcZxEFd3cd1mfmcP9lzleEpXnXDmqM4t2WLY47DsynYM6/M+bbyw== 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 4VVnmz2VQczKPq; Thu, 2 May 2024 21:55:47 +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 442Ltlpk041838; Thu, 2 May 2024 21:55:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 442LtlVB041835; Thu, 2 May 2024 21:55:47 GMT (envelope-from git) Date: Thu, 2 May 2024 21:55:47 GMT Message-Id: <202405022155.442LtlVB041835@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: b25ceb97eddc - main - Revert "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: b25ceb97eddcd58cfb2b433fe301ab28c678c249 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b25ceb97eddcd58cfb2b433fe301ab28c678c249 commit b25ceb97eddcd58cfb2b433fe301ab28c678c249 Author: Brooks Davis AuthorDate: 2024-05-02 21:53:21 +0000 Commit: Brooks Davis CommitDate: 2024-05-02 21:55:08 +0000 Revert "Make WITHOUT_UNDEFINED_VERSION the default" This is causing failures on gcc13 CI builds so those need to be fixed or worked around. This reverts commit 4510f2ca9170927309a423274e03f1eb8e27da27. --- share/man/man5/src.conf.5 | 10 ++++------ share/mk/bsd.opts.mk | 4 ++-- tools/build/options/WITHOUT_UNDEFINED_VERSION | 2 ++ tools/build/options/WITH_UNDEFINED_VERSION | 4 ---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 53d42321799b..5301fc488021 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd May 1, 2024 +.Dd April 23, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1716,11 +1716,9 @@ and that the runtime support library is available Do not build .Xr unbound 8 and related programs. -.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_UNDEFINED_VERSION +Link libraries with --no-undefined-version to ensure all symbols are +provided. .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 65ae4f4cfa7c..38d53cc6bf30 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -68,6 +68,7 @@ __DEFAULT_YES_OPTIONS = \ SSP \ TESTS \ TOOLCHAIN \ + UNDEFINED_VERSION \ WARNS \ WERROR @@ -80,8 +81,7 @@ __DEFAULT_NO_OPTIONS = \ PROFILE \ RETPOLINE \ STALE_STAGED \ - UBSAN \ - UNDEFINED_VERSION + UBSAN __DEFAULT_DEPENDENT_OPTIONS = \ MAKE_CHECK_USE_SANDBOX/TESTS \ diff --git a/tools/build/options/WITHOUT_UNDEFINED_VERSION b/tools/build/options/WITHOUT_UNDEFINED_VERSION new file mode 100644 index 000000000000..0e58eb00f3c1 --- /dev/null +++ b/tools/build/options/WITHOUT_UNDEFINED_VERSION @@ -0,0 +1,2 @@ +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 deleted file mode 100644 index 71b048349a6f..000000000000 --- a/tools/build/options/WITH_UNDEFINED_VERSION +++ /dev/null @@ -1,4 +0,0 @@ -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.