Blame java-1.7.0-openjdk-freetype-check-fix.patch
|
Jiri Vanek |
e2d69df |
diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk
|
|
Jiri Vanek |
e2d69df |
--- openjdk/jdk/make/common/shared/Sanity.gmk.sav 2012-02-14 16:12:48.000000000 -0500
|
|
Jiri Vanek |
e2d69df |
+++ openjdk/jdk/make/common/shared/Sanity.gmk 2012-03-07 17:31:26.153840755 -0500
|
|
Jiri Vanek |
e2d69df |
@@ -814,12 +814,12 @@ ifdef OPENJDK
|
|
Jiri Vanek |
e2d69df |
@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
|
|
Jiri Vanek |
e2d69df |
$(ECHO) "Failed to build freetypecheck." ) > $@
|
|
Jiri Vanek |
e2d69df |
|
|
Jiri Vanek |
e2d69df |
- sane-freetype: $(TEMPDIR)/freetypeinfo
|
|
Jiri Vanek |
e2d69df |
- @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
|
|
Jiri Vanek |
e2d69df |
- $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
|
|
Jiri Vanek |
e2d69df |
- " or higher is required. \n" \
|
|
Jiri Vanek |
e2d69df |
- "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
|
|
Jiri Vanek |
e2d69df |
- fi
|
|
Jiri Vanek |
e2d69df |
+# sane-freetype: $(TEMPDIR)/freetypeinfo
|
|
Jiri Vanek |
e2d69df |
+# @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
|
|
Jiri Vanek |
e2d69df |
+# $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
|
|
Jiri Vanek |
e2d69df |
+# " or higher is required. \n" \
|
|
Jiri Vanek |
e2d69df |
+# "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \
|
|
Jiri Vanek |
e2d69df |
+# fi
|
|
Jiri Vanek |
e2d69df |
else
|
|
Jiri Vanek |
e2d69df |
#do nothing (cross-compiling)
|
|
Jiri Vanek |
e2d69df |
sane-freetype:
|