5e504e1a5e
* Update with FreeBSD ports' patch-set file. * Add patches from icedtea's rhino.patch file. * Tested on NetBSD/amd64 current, NetBSD/i386 6.1, NetBSD/amd64 6.0.1, and DragonFly/i386 3.2.2. Changelog: * Unknown because I do not know previous version, 1.7.0.147.20110811. * Many bugs and security bugs should be fixed.
28 lines
1.1 KiB
Text
28 lines
1.1 KiB
Text
$NetBSD: patch-ab,v 1.5 2013/06/02 06:12:28 ryoon Exp $
|
|
|
|
--- jdk/make/common/shared/Sanity.gmk.orig 2012-08-10 17:21:34.000000000 +0000
|
|
+++ jdk/make/common/shared/Sanity.gmk
|
|
@@ -521,12 +521,7 @@ sane-variant:
|
|
# LD_LIBRARY_PATH should not be set, unless you are insane.
|
|
######################################################
|
|
sane-ld_library_path:
|
|
-ifdef LD_LIBRARY_PATH
|
|
- @$(ECHO) "ERROR: Your LD_LIBRARY_PATH environment variable is set. This may \n" \
|
|
- " produce binaries binaries incorrectly. Please unset it \n" \
|
|
- " and start your build again. \n" \
|
|
- "" >> $(ERROR_FILE)
|
|
-endif
|
|
+ true
|
|
|
|
######################################################
|
|
# LD_LIBRARY_PATH_64 should not be set, unless you are insane.
|
|
@@ -813,7 +808,8 @@ ifdef OPENJDK
|
|
@(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \
|
|
$(ECHO) "Failed to build freetypecheck." ) > $@
|
|
|
|
- sane-freetype: $(TEMPDIR)/freetypeinfo
|
|
+ sane-freetype:
|
|
+ sane-freetype_: $(TEMPDIR)/freetypeinfo
|
|
@if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \
|
|
$(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \
|
|
" or higher is required. \n" \
|