diff options
Diffstat (limited to 'www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro')
| -rw-r--r-- | www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro new file mode 100644 index 000000000000..fbd6975e7b8b --- /dev/null +++ b/www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro @@ -0,0 +1,12 @@ +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/libXcomposite/libXcomposite.pro.orig 2016-09-26 14:56:58 UTC ++++ Tools/qmake/config.tests/libXcomposite/libXcomposite.pro +@@ -1,3 +1,2 @@ + SOURCES = libXcomposite.cpp +-OBJECTS_DIR = obj + LIBS += -lXcomposite -lX11 |