From: Olly Betts <olly@survex.com>
Date: Fri, 24 Feb 2023 00:23:10 +0000 (-0500)
Subject: Suppress error about mismatching C++ ABI version
X-Git-Tag: archive/raspbian/3.2.11+dfsg1-1+rpi1~1^2^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b8841d6b2a08919aa4b91b7835ccaaf7110af1fc;p=wxwidgets3.2.git

Suppress error about mismatching C++ ABI version

Forwarded: no
Last-Update: 2022-07-18

In practice, the differences between recent ABI versions don't seem to be
incompatible since they apparently only affect obscure corner cases.  So
suppress this error so we don't have to rebuild the entire wx world in one
go.

Gbp-Pq: Name warn-for-compiler-abi-mismatch.patch
---

diff --git a/src/common/appbase.cpp b/src/common/appbase.cpp
index 87a3f97..d0fe392 100644
--- a/src/common/appbase.cpp
+++ b/src/common/appbase.cpp
@@ -850,6 +850,26 @@ bool wxAppConsoleBase::CheckBuildOptions(const char *optionsSignature,
         wxString prog = wxString::FromAscii(optionsSignature);
         wxString progName = wxString::FromAscii(componentName);
 
+	int l_off = lib.Find("compiler with C++ ABI ");
+	int p_off = prog.Find("compiler with C++ ABI ");
+	if (l_off != wxNOT_FOUND && p_off != wxNOT_FOUND) {
+	    int space;
+	    space = lib.find(',', l_off + 22);
+	    lib.erase(l_off, space - l_off);
+	    space = prog.find(',', p_off + 22);
+	    prog.erase(p_off, space - p_off);
+	    if (lib == prog) {
+		// The only difference is the ABI version, which apparently only
+		// affect obscure cases.  We used to warn here, so at least
+		// there was an indication of what's up if there is a problem
+		// due to ABI incompatibilities, but wxLogWarning() can result
+		// in a pop up dialog with some applications, which is just too
+		// intrusive, so just quietly ignore instead.
+		//wxLogWarning(msg.c_str());
+		return false;
+	    }
+	}
+
         wxLogFatalError(wxT("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
                         lib, progName, prog);