Since X11 and freetype aren't available on Macosx by default, and we (Oracle) are now shipping OpenJDK builds for Macosx, we need to start bundling freetype on Macosx, just like we do on Windows. This patch adds a new freetype bundle as a dependency for Macosx builds. It also updates the dependencies for Windows builds to get a new license file.

Previously we only included the license file in RI builds (openjdk only builds with BCL source license) but we have now decided to include it with GPL licensed builds as well. The patch removes the special handling of the license for RI builds. It also makes configure look for the license file in the root of the --with-freetype argument so that Jib only has to provide the one argument. Finally, the --with-freetype-license logic was outside of the "needs freetype" block so I moved inside that block.

Bug: https://bugs.openjdk.java.net/browse/JDK-8190464

Webrev: http://cr.openjdk.java.net/~erikj/8190464/webrev.01/

/Erik

Reply via email to