Date: Wed, 2 Aug 2023 17:43:51 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5405244f3481 - main - graphics/qt6-3d: Fix pkg-plist on i386 Message-ID: <202308021743.372Hhp4T068027@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=5405244f34816f4443bec396d1e8a05e7cedbcd4 commit 5405244f34816f4443bec396d1e8a05e7cedbcd4 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2023-08-02 17:27:21 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2023-08-02 17:43:46 +0000 graphics/qt6-3d: Fix pkg-plist on i386 OPTIONS_SUB was subbing out %%SIMD%% in pkg-plist as "" for i386, even if CPUTYPE was not set, but bsd.cpu.mk only assumes that sse2 instructions are available for amd64 in this case. Reported by: pkg-fallout --- graphics/qt6-3d/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile index 87bcccf5cefd..f16c62323acb 100644 --- a/graphics/qt6-3d/Makefile +++ b/graphics/qt6-3d/Makefile @@ -34,19 +34,19 @@ OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFAULT_i386= SIMD OPTIONS_DEFAULT_amd64= SIMD -OPTIONS_SUB= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSIMD} . if !empty(MACHINE_CPU:Mavx2) CMAKE_ARGS+= -DINPUT_qt3d_simd=avx2 -PLIST_SUB+= AVX2="" +PLIST_SUB+= AVX2="" SIMD="" . elif !empty(MACHINE_CPU:Msse2) CMAKE_ARGS+= -DINPUT_qt3d_simd=sse2 -PLIST_SUB+= AVX2="@comment " +PLIST_SUB+= AVX2="@comment " SIMD="" . else CMAKE_ARGS+= -DINPUT_qt3d_simd=no +PLIST_SUB+= SIMD="@comment " . endif .else CMAKE_ARGS+= -DINPUT_qt3d_simd=no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308021743.372Hhp4T068027>