Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8144616: Problem building OpenJDK/harfbuzz on jprt
authorprr
Thu, 03 Dec 2015 11:53:00 -0800
changeset 34432 958d65712d3e
parent 34431 0b471e6f3fce
child 34433 acfcd63174a9
child 34798 84d33f91b71e
8144616: Problem building OpenJDK/harfbuzz on jprt Reviewed-by: serb, vadim
jdk/make/lib/Awt2dLibraries.gmk file | annotate | diff | comparison | revisions 
--- a/jdk/make/lib/Awt2dLibraries.gmk	Thu Dec 03 14:01:33 2015 +0530
+++ b/jdk/make/lib/Awt2dLibraries.gmk	Thu Dec 03 11:53:00 2015 -0800
@@ -622,9 +622,8 @@
 ifneq ($(OPENJDK_TARGET_OS), macosx)
   LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-coretext.cc
 endif
-ifndef OPENJDK
-  LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
-endif
+# hb-ft.cc is not presently needed, and requires freetype 2.4.2 or later.
+LIBFONTMANAGER_EXCLUDE_FILES += harfbuzz/hb-ft.cc
 
 LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
jdk-sandbox