diff options
| author | Robert Clausecker <fuz@FreeBSD.org> | 2025-10-06 21:37:29 +0000 |
|---|---|---|
| committer | Robert Clausecker <fuz@FreeBSD.org> | 2025-10-06 21:41:28 +0000 |
| commit | 9b35061c8126f0e9f9a17b69e43b17962acd5f26 (patch) | |
| tree | 72837e2af1f7e9fbd3b953ea647e899f5344c49e | |
| parent | 208fcc004c5c4e5664e1028dff0eec3b2cca585e (diff) | |
benchmarks/vkoverhead: Revert "exorcise -Werror and unbreak on armv7"
This reverts commit f95a776840b0d53d446a8f219ed6ed5a7b135029.
As discussed with jbeich, this fix may fix the build, but it doesn't
lead to a working port. Revert until a proper fix can be designed.
MFH: 2025Q4
(cherry picked from commit e9ced2f2b9818c6366d2a7598cca4d8963115be9)
| -rw-r--r-- | benchmarks/vkoverhead/Makefile | 8 | ||||
| -rw-r--r-- | benchmarks/vkoverhead/files/patch-meson.build | 34 |
2 files changed, 8 insertions, 34 deletions
diff --git a/benchmarks/vkoverhead/Makefile b/benchmarks/vkoverhead/Makefile index 1aa0f9f98c95..b54c28d4b6fd 100644 --- a/benchmarks/vkoverhead/Makefile +++ b/benchmarks/vkoverhead/Makefile @@ -13,6 +13,10 @@ 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 @@ -21,4 +25,8 @@ 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 deleted file mode 100644 index fffe1d9e8492..000000000000 --- a/benchmarks/vkoverhead/files/patch-meson.build +++ /dev/null @@ -1,34 +0,0 @@ ---- 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', |