[jackhill/guix/guix.git] / gnu / packages / patches / qtbase-moc-ignore-gcc-macro.patch

The moc executable loops through headers on CPLUS_INCLUDE_PATH and stumbles
on the GCC internal _GLIBCXX_VISIBILITY macro.  Tell it to ignore it as it is
not supposed to be looking there to begin with.

Upstream report: https://bugreports.qt.io/browse/QTBUG-83160

diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -188,6 +188,7 @@ int runMoc(int argc, char **argv)
     dummyVariadicFunctionMacro.arguments += Symbol(0, PP_IDENTIFIER, "__VA_ARGS__");
     pp.macros["__attribute__"] = dummyVariadicFunctionMacro;
     pp.macros["__declspec"] = dummyVariadicFunctionMacro;
+    pp.macros["_GLIBCXX_VISIBILITY"] = dummyVariadicFunctionMacro;
 
     QString filename;
     QString output;
Commit	Line	Data
26e92a30 MB	1	The moc executable loops through headers on CPLUS_INCLUDE_PATH and stumbles
	2	on the GCC internal _GLIBCXX_VISIBILITY macro. Tell it to ignore it as it is
	3	not supposed to be looking there to begin with.
	4
	5	Upstream report: https://bugreports.qt.io/browse/QTBUG-83160
	6
	7	diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
	8	--- a/src/tools/moc/main.cpp
	9	+++ b/src/tools/moc/main.cpp
	10	@@ -188,6 +188,7 @@ int runMoc(int argc, char **argv)
	11	dummyVariadicFunctionMacro.arguments += Symbol(0, PP_IDENTIFIER, "__VA_ARGS__");
	12	pp.macros["__attribute__"] = dummyVariadicFunctionMacro;
	13	pp.macros["__declspec"] = dummyVariadicFunctionMacro;
	14	+ pp.macros["_GLIBCXX_VISIBILITY"] = dummyVariadicFunctionMacro;
	15
	16	QString filename;
	17	QString output;