The fix for 7046587 is causing OpenJDK builds to fail on Unix platforms
due to a native method signature mismatch :
opt/jprt/products/P2/ccache2.4/bin/CC -xO4 -Qoption ube -O4~yz -xregs=no%frameptr -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib -m64 -KPIC -DHEADLESS -DNDEBUG -DTRIMMED -D__solaris__ -Di586 -DcpuIntel -D_LITTLE_ENDIAN= -Damd64 -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS -I. -I../../../build/solaris-amd64/tmp/sun/sun.font/fontmanager/CClassHeaders -I../../../src/solaris/javavm/export -I../../../src/share/javavm/export -I../../../src/share/native/common -I../../../src/solaris/native/common -I../../../src/share/native/sun/font -I../../../src/solaris/native/sun/font -I/opt/jprt/products/P2/freetype64-2.3.4/freetype-amd64/include -I/opt/jprt/products/P2/freetype64-2.3.4/freetype-amd64/include/freetype2 -I../../../src/share/native/sun/font -I../../../src/share/native/sun/font/layout -I../../../src/share/native/sun/awt/image/cvutils -I../../../src/solaris/native/sun/awt -I../../../src/share/native/sun/awt/debug -I../../../src/share/native/sun/java2d/loops -I../../../src/share/native/sun/java2d/pipe -I../../../src/solaris/native/sun/java2d -I../../../src/share/native/sun/java2d -I../../../build/solaris-amd64/tmp/sun/sun.font/fontmanager/../../sun.awt/awt/CClassHeaders -DLE_STANDALONE -c -o ../../../build/solaris-amd64/tmp/sun/sun.font/fontmanager/obj64/LigatureSubstProc.o ../../../src/share/native/sun/font/layout/LigatureSubstProc.cpp
"../../../src/share/native/sun/font/freetypeScaler.c", line 368: identifier redeclared: Java_sun_font_FreetypeFontScaler_createScalerContextNative
current : function(pointer to pointer to const struct JNINativeInterface_ {..}, pointer to struct _jobject {..}, long, pointer to struct _jobject {..}, unsigned char, int, int, float, float) returning long
previous: function(pointer to pointer to const struct JNINativeInterface_ {..}, pointer to struct _jobject {..}, long, pointer to struct _jobject {..}, int, int, float, float) returning long : "../../../build/solaris-amd64/tmp/sun/sun.font/fontmanager/CClassHeaders/sun_font_FreetypeFontScaler.h", line 147
cc: acomp failed for ../../../src/share/native/sun/font/freetypeScaler.c