Tried it before, this update breaks mariadb.
On 2023/11/06 10:01, Klemens Nanni wrote:
> upstream dropped -Wl,--as-needed usage, thus our AS_NEEDED cmake option
> patch has no effect. So looks like we no longer need the clang+ld.bfd
> treatment, but I can't test on these platforms, some I prefer more eyes.
>
> Tests fail/pass equally as before on amd64:
>
> 85% tests passed, 3 tests failed out of 20
>
> Total Test time (real) = 0.11 sec
>
> The following tests FAILED:
> 3 - chrono-test (Failed)
> 17 - xchar-test (Failed)
> 19 - posix-mock-test (Failed)
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/fmt/Makefile,v
> diff -u -p -r1.5 Makefile
> --- Makefile 7 Jun 2022 11:40:17 -0000 1.5
> +++ Makefile 5 Nov 2023 18:01:06 -0000
> @@ -1,10 +1,8 @@
> COMMENT= alternative formatting library for C and C++
>
> -GH_ACCOUNT= fmtlib
> -GH_PROJECT= fmt
> -GH_TAGNAME= 8.1.1
> +DIST_TUPLE= github fmtlib fmt 10.1.1 .
>
> -SHARED_LIBS= fmt 1.1
> +SHARED_LIBS= fmt 2.0
>
> CATEGORIES= devel
>
> @@ -14,16 +12,8 @@ PERMIT_PACKAGE= Yes
> # C++11
> COMPILER= base-clang ports-gcc
> MODULES= devel/cmake
> -WANTLIB+= ${COMPILER_LIBCXX}
> -
> +WANTLIB+= ${COMPILER_LIBCXX} m
>
> CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=on
> -
> -# Fix undefined references to pthread_* symbols on clang+ld.bfd archs by
> -# disabling -Wl,--as-needed.
> -.include <bsd.port.arch.mk>
> -.if !${PROPERTIES:Mlld} && ${PROPERTIES:Mclang}
> -CONFIGURE_ARGS+= -DAS_NEEDED=off
> -.endif
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/fmt/distinfo,v
> diff -u -p -r1.3 distinfo
> --- distinfo 7 Jun 2022 11:40:17 -0000 1.3
> +++ distinfo 5 Nov 2023 17:50:24 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (fmt-8.1.1.tar.gz) = PXlNPPZ2M7NLJ3Hrnwc73ofoRuDTldJU33shHvHsc0Y=
> -SIZE (fmt-8.1.1.tar.gz) = 826254
> +SHA256 (fmtlib-fmt-10.1.1.tar.gz) =
> eLjApyscNeREOn4wjfUkmCUtHO/CsIyal7ye5s/mH4s=
> +SIZE (fmtlib-fmt-10.1.1.tar.gz) = 851454
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 7 Jun 2022 11:40:17 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,24 +0,0 @@
> -Allow linking without '-Wl,--as-needed', fix the build on clang+ld.bfd archs.
> -It's needed to do it like this since target_link_libraries takes preference
> -over LDFLAGS.
> -
> -Index: CMakeLists.txt
> ---- CMakeLists.txt.orig
> -+++ CMakeLists.txt
> -@@ -72,6 +72,7 @@ set_verbose(FMT_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CA
> - option(FMT_PEDANTIC "Enable extra warnings and expensive tests." OFF)
> - option(FMT_WERROR "Halt the compilation with an error on compiler warnings."
> - OFF)
> -+option(AS_NEEDED "Use -Wl,--as-needed for linking." ON)
> -
> - # Options that control generation of various targets.
> - option(FMT_DOC "Generate the doc target." ${FMT_MASTER_PROJECT})
> -@@ -286,7 +287,7 @@ endif ()
> -
> - if (BUILD_SHARED_LIBS)
> - if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" AND
> -- NOT EMSCRIPTEN)
> -+ NOT EMSCRIPTEN AND AS_NEEDED)
> - # Fix rpmlint warning:
> - # unused-direct-shlib-dependency /usr/lib/libformat.so.1.1.0
> /lib/libm.so.6.
> - target_link_libraries(fmt -Wl,--as-needed)
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/fmt/pkg/PLIST,v
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 11 Mar 2022 18:50:03 -0000 1.3
> +++ pkg/PLIST 5 Nov 2023 17:55:21 -0000
> @@ -6,11 +6,11 @@ include/fmt/compile.h
> include/fmt/core.h
> include/fmt/format-inl.h
> include/fmt/format.h
> -include/fmt/locale.h
> include/fmt/os.h
> include/fmt/ostream.h
> include/fmt/printf.h
> include/fmt/ranges.h
> +include/fmt/std.h
> include/fmt/xchar.h
> lib/cmake/
> lib/cmake/fmt/
>
