diff options
Diffstat (limited to 'odr-fix.patch')
| -rw-r--r-- | odr-fix.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/odr-fix.patch b/odr-fix.patch deleted file mode 100644 index d595d1ba198e..000000000000 --- a/odr-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/oscar/oscar.pro b/oscar/oscar.pro -index ed8195e5..116ec8b9 100644 ---- a/oscar/oscar.pro -+++ b/oscar/oscar.pro -@@ -546,6 +546,9 @@ gcc | clang { - QMAKE_CFLAGS += -Wno-error=deprecated-declarations - QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations - -+# Ignore ODR-violations until fixed in upstream: https://gitlab.com/pholy/OSCAR-code/-/issues/52 -+QMAKE_CXXFLAGS += -Wno-error=odr -+ - lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) { - QMAKE_CFLAGS += -Wno-error=strict-aliasing - QMAKE_CXXFLAGS += -Wno-error=strict-aliasing |