Date: Sun, 5 Oct 2025 13:46:39 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: e9052757eafe - 2025Q4 - benchmarks/vkoverhead: exorcise -Werror and unbreak on armv7 Message-ID: <202510051346.595Dkd87033033@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2025Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9052757eafeb63ea15a46c8a2d0f46f65a101c5 commit e9052757eafeb63ea15a46c8a2d0f46f65a101c5 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-02-27 23:16:02 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2025-10-05 13:46:27 +0000 benchmarks/vkoverhead: exorcise -Werror and unbreak on armv7 This fixes the build on armv7, avoiding a bogus int conversion warning. While we are at it, turn static REINPLACE_CMD usage into patch file as per policy. Approved by: portmgr (build fix blanket) MFH: 2025Q4 (cherry picked from commit f95a776840b0d53d446a8f219ed6ed5a7b135029) --- benchmarks/vkoverhead/Makefile | 8 ------- benchmarks/vkoverhead/files/patch-meson.build | 34 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/benchmarks/vkoverhead/Makefile b/benchmarks/vkoverhead/Makefile index b54c28d4b6fd..1aa0f9f98c95 100644 --- a/benchmarks/vkoverhead/Makefile +++ b/benchmarks/vkoverhead/Makefile @@ -13,10 +13,6 @@ WWW= https://github.com/zmike/vkoverhead LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_armv7= fails to build due -Werror=int-conversion -BROKEN_i386= fails to build due -Werror=int-conversion -BROKEN_powerpc= fails to build due -Werror=int-conversion - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} RUN_DEPENDS= vulkan-loader>0:graphics/vulkan-loader @@ -25,8 +21,4 @@ USE_GITHUB= yes GH_ACCOUNT= zmike PLIST_FILES= bin/${PORTNAME} -post-patch: -# Derive Python version from Meson - @${REINPLACE_CMD} -e "s,'python3',," ${WRKSRC}/meson.build - .include <bsd.port.mk> diff --git a/benchmarks/vkoverhead/files/patch-meson.build b/benchmarks/vkoverhead/files/patch-meson.build new file mode 100644 index 000000000000..fffe1d9e8492 --- /dev/null +++ b/benchmarks/vkoverhead/files/patch-meson.build @@ -0,0 +1,34 @@ +--- meson.build.orig 2025-10-04 17:26:23 UTC ++++ meson.build +@@ -34,7 +34,7 @@ null_dep = dependency('', required : false) + null_dep = dependency('', required : false) + + +-prog_python = import('python').find_installation('python3') ++prog_python = import('python').find_installation() + + # Arguments for the preprocessor, put these in a separate array from the C and + # C++ (cpp in meson terminology) arguments since they need to be added to the +@@ -208,11 +208,7 @@ else + cpp_args += cpp.get_supported_arguments(_trial) + else + _trial_c = [ +- '-Werror=implicit-function-declaration', +- '-Werror=return-type', +- '-Werror=empty-body', +- '-Werror=incompatible-pointer-types', +- '-Werror=int-conversion', ++ '-Wno-error=int-conversion', + '-Wimplicit-fallthrough', + '-Wno-missing-field-initializers', + '-Wno-format-truncation', +@@ -225,8 +221,7 @@ else + '-Wno-unused-function', + ] + _trial_cpp = [ +- '-Werror=return-type', +- '-Werror=empty-body', ++ '-Wno-error=int-conversion', + '-Wno-non-virtual-dtor', + '-Wno-missing-field-initializers', + '-Wno-format-truncation',home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510051346.595Dkd87033033>