summarylogtreecommitdiffstats
path: root/odr-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'odr-fix.patch')
-rw-r--r--odr-fix.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/odr-fix.patch b/odr-fix.patch
new file mode 100644
index 000000000000..d595d1ba198e
--- /dev/null
+++ b/odr-fix.patch
@@ -0,0 +1,14 @@
+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