--- java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/WebCore/TargetJava.pri~ 2016-09-11 22:26:17.000000000 +0200 +++ java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/WebCore/TargetJava.pri 2016-09-14 11:54:23.958821974 +0200 @@ -171,7 +171,7 @@ } # INCLUDEPATH += $(WEBKIT_OUTPUTDIR)/import/include # defined in WebKitJava.pri -LIBS += -L$(WEBKIT_OUTPUTDIR)/import/lib -lsqlite3 +LIBS += -lsqlite3 # The following line ensures that __STDC_FORMAT_MACROS is defined when # is included in the precompiled header. Note that the file @@ -229,9 +229,9 @@ # just for build debug: force verboce output from linker QMAKE_LFLAGS += -Wl,--verbose - # statically link with icu libraries in order to avoid version conflict + # link with icu libraries QMAKE_LFLAGS += `pkg-config --libs-only-L icu-uc` - LIBS += -Wl,-Bstatic -licui18n -licuuc -licudata -Wl,-Bdynamic -ldl + LIBS += -licui18n -licuuc -licudata -ldl } solaris-cc { QMAKE_LFLAGS += -M$$PWD/mapfile-vers --- java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/JavaScriptCore/LLIntOffsetsExtractor.pro~ 2016-09-11 22:26:21.000000000 +0200 +++ java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/JavaScriptCore/LLIntOffsetsExtractor.pro 2016-09-14 13:26:30.612313707 +0200 @@ -29,8 +29,7 @@ linux* { INCLUDEPATH += \ - $(JAVA_HOME)/include/linux \ - $(WEBKIT_OUTPUTDIR)/import/include + $(JAVA_HOME)/include/linux } win* { @@ -92,7 +91,6 @@ $$PWD/dfg \ $$PWD/debugger \ $$PWD/ForwardingHeaders \ - $(WEBKIT_OUTPUTDIR)/import/include/icu \ $(JAVA_HOME)/include LLINT_DEPENDENCY = $$PWD/offlineasm/generate_offset_extractor.rb --- java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/WebKitJava.pri~ 2016-09-11 22:26:18.000000000 +0200 +++ java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Source/WebKitJava.pri 2016-09-14 13:27:10.077159836 +0200 @@ -49,8 +49,7 @@ linux-* { INCLUDEPATH += \ - $(JAVA_HOME)/include/linux \ - $(WEBKIT_OUTPUTDIR)/import/include + $(JAVA_HOME)/include/linux } solaris-* { --- java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Tools/DumpRenderTree/DumpRenderTreeJava.pro~ 2016-09-11 22:26:18.000000000 +0200 +++ java-1.8.0-openjfx-1.8.0.102/modules/web/src/main/native/Tools/DumpRenderTree/DumpRenderTreeJava.pro 2016-09-14 13:27:20.982393644 +0200 @@ -73,11 +73,6 @@ $(WEBKIT_OUTPUTDIR)/import/include/icu } -linux-* { - INCLUDEPATH += \ - $(WEBKIT_OUTPUTDIR)/import/include -} - mac* { LIBS += -lc++ -lobjc -framework AppKit }