Re: Remove -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON workarounds
Rafael Sadowski <[email protected]>
| Newsgroups | gmane.os.openbsd.ports |
|---|---|
| Message-ID | <[email protected]> |
On Thu Aug 13, 2026 at 12:09:52AM +0200, Theo Buehler wrote:
> Since I never managed to figure out why they were needed, I also don't
> know why they are no longer needed...
>
> These were added to work around build failures vaguely related to C++20,
> libstdc++, stdarg.h and __bsd_locale_fallbacks.h. The latter header has
> been reorganized as part of the last llvm update. cmake 3.28 mentioned
> in a comment has long been replaced by more modern macro soup.
>
> The diff below builds on amd64 and aarch64, which I think is good
> enough of a test.
>
> In libquotient, tests build, but they fail quite spectacularly, among
> other things since you need to prepare a matrix server. I'll leave that
> for someone else to figure out and only chose to adjust an XXX comment.
OK rsadowski
>
> Index: graphics/blender/Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/blender/Makefile,v
> diff -u -p -r1.151 Makefile
> --- graphics/blender/Makefile 2 Mar 2026 15:00:23 -0000 1.151
> +++ graphics/blender/Makefile 12 Aug 2026 20:37:24 -0000
> @@ -9,7 +9,7 @@ COMMENT = 3D creation software
> VERSION = 4.5.3
> V = ${VERSION:R}
> DISTNAME = blender-${VERSION}
> -REVISION = 3
> +REVISION = 4
>
> CATEGORIES = graphics
>
> @@ -49,9 +49,6 @@ CONFIGURE_ARGS = -DWITH_PYTHON_INSTALL=O
> -DWITH_PULSEAUDIO=OFF \
> -DWITH_SYSTEM_GLEW=ON \
> -DWITH_GHOST_WAYLAND=OFF
> -
> -# Disable PCH, build issue with cmake 3.28
> -CONFIGURE_ARGS += -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
>
> .if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386"
> CONFIGURE_ARGS+= -DWITH_CPU_SIMD=OFF
> Index: net/nheko/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/nheko/Makefile,v
> diff -u -p -r1.18 Makefile
> --- net/nheko/Makefile 19 Jan 2026 10:50:05 -0000 1.18
> +++ net/nheko/Makefile 12 Aug 2026 20:37:10 -0000
> @@ -3,7 +3,7 @@ COMMENT = desktop client for Matrix
> GH_ACCOUNT = Nheko-Reborn
> GH_PROJECT = nheko
> GH_TAGNAME = v0.12.1
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES= net
>
> @@ -47,6 +47,5 @@ LIB_DEPENDS = databases/lmdb \
>
> # -DCMAKE_DISABLE_FIND_PACKAGE_GIT=ON (or _Git or _git) do not work
> CONFIGURE_ARGS += -DGIT=OFF
> -CONFIGURE_ARGS += -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
>
> .include <bsd.port.mk>
> Index: x11/libquotient/Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/libquotient/Makefile,v
> diff -u -p -r1.12 Makefile
> --- x11/libquotient/Makefile 9 Dec 2025 10:45:13 -0000 1.12
> +++ x11/libquotient/Makefile 12 Aug 2026 21:14:49 -0000
> @@ -3,6 +3,7 @@ COMMENT = Qt6 library for writing cross-
> GH_ACCOUNT = quotient-im
> GH_PROJECT = libQuotient
> GH_TAGNAME = 0.9.5
> +REVISION = 0
>
> SHARED_LIBS += QuotientQt6 3.0 # 0.0
>
> @@ -26,10 +27,9 @@ LIB_DEPENDS = devel/olm \
> security/qtkeychain,qt6 \
>
> CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=ON \
> - -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON \
> - -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON
> + -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
>
> -# XXX C++20 vs. libstd++ in quotest.cpp
> +# Tests require a matrix server on localhost:1234
> CONFIGURE_ARGS += -DBUILD_TESTING=OFF
>
> # XXX unpackaged quotest is still built when disabling tests
>