From 08c13446c40765c6bb84a436f82697edf7e23eb2 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Thu, 13 Aug 2020 14:05:53 +0530 Subject: [PATCH] openimageio: add patch to remove Werror option in CI --- .../0017-cmake-compiler-remove-Werror.patch | 15 +++++++++++++++ mingw-w64-openimageio/PKGBUILD | 7 +++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-openimageio/0017-cmake-compiler-remove-Werror.patch diff --git a/mingw-w64-openimageio/0017-cmake-compiler-remove-Werror.patch b/mingw-w64-openimageio/0017-cmake-compiler-remove-Werror.patch new file mode 100644 index 0000000000..59bb863b13 --- /dev/null +++ b/mingw-w64-openimageio/0017-cmake-compiler-remove-Werror.patch @@ -0,0 +1,15 @@ +--- oiio-Release-2.1.18.1.orig/src/cmake/compiler.cmake ++++ oiio-Release-2.1.18.1/src/cmake/compiler.cmake +@@ -83,12 +83,6 @@ + option (STOP_ON_WARNING "Stop building if there are any compiler warnings" OFF) + if (NOT MSVC) + add_compile_options ("-Wall") +- if (STOP_ON_WARNING OR DEFINED ENV{CI}) +- add_compile_options ("-Werror") +- # N.B. Force CI builds (Travis defines $CI) to use -Werror, even if +- # STOP_ON_WARNING has been switched off by default, which we may do +- # in release branches. +- endif () + endif () + + diff --git a/mingw-w64-openimageio/PKGBUILD b/mingw-w64-openimageio/PKGBUILD index eaf95c96e9..08d9fa9d01 100644 --- a/mingw-w64-openimageio/PKGBUILD +++ b/mingw-w64-openimageio/PKGBUILD @@ -54,7 +54,8 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/OpenImageIO/oiio/archi 0013-dont-export-enums.patch 0014-fix-ptex-string-format.patch 0015-python-module-ext.patch - 0016-strutil-dont-export-inline-functions.patch) + 0016-strutil-dont-export-inline-functions.patch + 0017-cmake-compiler-remove-Werror.patch) sha256sums=('e2cf54f5b28e18fc88e76e1703f2e39bf144c88378334527e4a1246974659a85' 'SKIP' '73c46166c1d19922b6b54f4e1e18128c33dadbc72a36b683049ec297ce1056b3' @@ -67,7 +68,8 @@ sha256sums=('e2cf54f5b28e18fc88e76e1703f2e39bf144c88378334527e4a1246974659a85' 'b3d1ce84de09b2de5047c79c7a9fbaff59d7cd45d0ce92ddd11fe40082a781b4' '6845acb6229a40512407a983aa07470e9ff1832db7a1e01c408ee74898ddc504' '7e9ab73459f1d4fe859d51682da75c2e0eaa42e3a14deb1b012db31867a45fa7' - '8fc1c63974ca1a1aff3fadbdbb855f7e977680e510624815dabc35ec413e2a86') + '8fc1c63974ca1a1aff3fadbdbb855f7e977680e510624815dabc35ec413e2a86' + '887dbdea1f74a5745ce0a1f3782174b4b5ce676d0c35124ec19e2dde6f841ff9') prepare() { cd ${srcdir}/oiio-Release-${pkgver} @@ -82,6 +84,7 @@ prepare() { patch -p1 -i ${srcdir}/0014-fix-ptex-string-format.patch patch -p1 -i ${srcdir}/0015-python-module-ext.patch patch -p1 -i ${srcdir}/0016-strutil-dont-export-inline-functions.patch + patch -p1 -i ${srcdir}/0017-cmake-compiler-remove-Werror.patch } build() {