Date: Thu, 2 May 2024 21:55:47 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: b25ceb97eddc - main - Revert "Make WITHOUT_UNDEFINED_VERSION the default" Message-ID: <202405022155.442LtlVB041835@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=b25ceb97eddcd58cfb2b433fe301ab28c678c249 commit b25ceb97eddcd58cfb2b433fe301ab28c678c249 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2024-05-02 21:53:21 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405022155.442LtlVB041835>