summaryrefslogtreecommitdiff
path: root/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro
diff options
context:
space:
mode:
Diffstat (limited to 'www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro')
-rw-r--r--www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro13
1 files changed, 13 insertions, 0 deletions
diff --git a/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro
new file mode 100644
index 000000000000..118e22fd29ab
--- /dev/null
+++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro
@@ -0,0 +1,13 @@
+Setting OBJECTS_DIR to "obj" causes problems with make(1), as "obj" is one of
+the directories make tries to enter in case it exists (because of .OBJDIR).
+Since qmake will create it because of OBJECTS_DIR, make will invoke the
+compiler from there and fail because it's trying to pass "-o obj/foo.o" while
+already in obj/.
+
+--- Tools/qmake/config.tests/glx/glx.pro.orig 2016-09-26 14:56:31 UTC
++++ Tools/qmake/config.tests/glx/glx.pro
+@@ -1,4 +1,3 @@
+ SOURCES = glx.cpp
+-OBJECTS_DIR = obj
+ LIBS += -lX11 -lGL
+