DELTA 422711 14527 35 SVN!EHI]D2leveldb.so:databases/leveldbENDREP DELTA SVNJLJJdatabases/leveldb installs the memenv.h header into a different location. --- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp.orig 2016-09-26 15:03:55 UTC +++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include ENDREP DELTA SVN}}}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 ENDREP DELTA SVNmommdatabases/leveldb installs the memenv.h header into a different location. --- Tools/qmake/config.tests/leveldb/leveldb.cpp.orig 2016-09-26 15:03:32 UTC +++ Tools/qmake/config.tests/leveldb/leveldb.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include int main(int, char**) { ENDREP DELTA SVN0d00x^AO0W#.G(kQpqq6„O `OZ=;+q(Ŕ|֋o kC 4L" T֗hCّC߉{Z܏ޓ*iuMP9C~Bښ 4CjG8E'[KZcl`kK#I:SYe*ٝ]gWF_\!_fsF#t<OR q*ΫJd OġH ENDREP DELTA SVN#S##x^AO1WpۅEHBB@ofwji׶{ ={o|o&#c5{Z7r [eiɢ6t8 w1nz#Њ+0T:m Z}-A8з΢[P3; &aP%ᣱ8 )Q]ҷciaX~pe1Bvr!VIp\UZ'\z9 cslװJ*Oh=)CjGU&~_jOG#h