104 lines
4.2 KiB
Diff
104 lines
4.2 KiB
Diff
diff --git a/jdk/make/common/shared/Defs-linux.gmk b/jdk/make/common/shared/Defs-linux.gmk
|
|
index ecdf5d77..405e686d 100644
|
|
--- a/jdk/make/common/shared/Defs-linux.gmk
|
|
+++ b/jdk/make/common/shared/Defs-linux.gmk
|
|
@@ -61,7 +61,7 @@ USRJDKINSTANCES_PATH =/opt/java
|
|
ifneq "$(origin ALT_UNIXCOMMAND_PATH)" "undefined"
|
|
UNIXCOMMAND_PATH :=$(call PrefixPath,$(ALT_UNIXCOMMAND_PATH))
|
|
else
|
|
- UNIXCOMMAND_PATH = /bin/
|
|
+ UNIXCOMMAND_PATH =
|
|
endif
|
|
|
|
# USRBIN_PATH: path to where the most common Unix commands are.
|
|
@@ -69,7 +69,7 @@ endif
|
|
ifneq "$(origin ALT_USRBIN_PATH)" "undefined"
|
|
USRBIN_PATH :=$(call PrefixPath,$(ALT_USRBIN_PATH))
|
|
else
|
|
- USRBIN_PATH = /usr/bin/
|
|
+ USRBIN_PATH =
|
|
endif
|
|
|
|
# UNIXCCS_PATH: path to where the Solaris ported UNIX commands can be found
|
|
@@ -99,7 +99,7 @@ endif
|
|
ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
|
|
COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
|
|
else
|
|
- COMPILER_PATH =/usr/bin/
|
|
+ COMPILER_PATH =
|
|
endif
|
|
|
|
# OPENWIN_HOME: path to where the X11 environment is installed.
|
|
@@ -115,7 +115,7 @@ endif
|
|
ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
|
|
DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
|
|
else
|
|
- DEVTOOLS_PATH =/usr/bin/
|
|
+ DEVTOOLS_PATH =
|
|
endif
|
|
|
|
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
|
|
diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk
|
|
index 1cebe93c..1cf22ebf 100644
|
|
--- a/jdk/make/common/shared/Defs-utils.gmk
|
|
+++ b/jdk/make/common/shared/Defs-utils.gmk
|
|
@@ -197,7 +197,7 @@ ifeq ($(PLATFORM),linux)
|
|
$(wildcard $(UTILS_USR_BIN_PATH)sort))
|
|
NAWK = $(USRBIN_PATH)gawk
|
|
# Intrinsic unix command, with backslash-escaped character interpretation
|
|
- ECHO = /bin/echo -e
|
|
+ ECHO = echo -e
|
|
# These are really in UTILS_USR_BIN_PATH on Linux
|
|
ifndef CROSS_COMPILE_ARCH
|
|
AR = $(UTILS_USR_BIN_PATH)ar
|
|
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
|
|
index 1dbedb17..bcb59d8f 100644
|
|
--- a/jdk/make/common/shared/Sanity.gmk
|
|
+++ b/jdk/make/common/shared/Sanity.gmk
|
|
@@ -106,8 +106,8 @@ ifeq ($(PLATFORM), linux)
|
|
elif [ -f /etc/lsb-release ] ; then \
|
|
$(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \
|
|
fi)
|
|
- ALSA_INCLUDE=/usr/include/alsa/version.h
|
|
- ALSA_LIBRARY=/usr/lib/libasound.so
|
|
+ ALSA_INCLUDE=$(ALSA_DIR)/include/alsa/version.h
|
|
+ ALSA_LIBRARY=$(ALSA_DIR)/lib/libasound.so
|
|
_ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \
|
|
$(SED) -e 's@.*"\(.*\)".*@\1@' )
|
|
ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
|
|
diff --git a/jdk/make/tools/freetypecheck/freetypecheck.c b/jdk/make/tools/freetypecheck/freetypecheck.c
|
|
index d91a0add..38b76bf3 100644
|
|
--- a/jdk/make/tools/freetypecheck/freetypecheck.c
|
|
+++ b/jdk/make/tools/freetypecheck/freetypecheck.c
|
|
@@ -78,7 +78,7 @@ int main(int argc, char** argv) {
|
|
char v[50];
|
|
FT_Int major, minor, patch;
|
|
FT_Library library;
|
|
- sprintf(v, "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
|
|
+ sprintf(v, "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR > 9 ? 9 : FREETYPE_MINOR, FREETYPE_PATCH);
|
|
|
|
printf("Required version of freetype: %s\n",
|
|
QUOTEMACRO(REQUIRED_FREETYPE_VERSION));
|
|
@@ -90,7 +90,7 @@ int main(int argc, char** argv) {
|
|
|
|
FT_Init_FreeType(&library);
|
|
FT_Library_Version(library, &major, &minor, &patch);
|
|
- sprintf(v, "%d.%d.%d", major, minor, patch);
|
|
+ sprintf(v, "%d.%d.%d", major, minor > 9 ? 9 : minor, patch);
|
|
|
|
printf("Detected freetype library: %s\n", v);
|
|
if (strcmp(v, QUOTEMACRO(REQUIRED_FREETYPE_VERSION)) < 0) {
|
|
diff --git a/langtools/make/build.properties b/langtools/make/build.properties
|
|
index 5c4ad09c..e5a969c0 100644
|
|
--- a/langtools/make/build.properties
|
|
+++ b/langtools/make/build.properties
|
|
@@ -68,7 +68,7 @@ javac.no.jdk.warnings = -XDignore.symbol.file=true
|
|
# set the following to -version to verify the versions of javac being used
|
|
javac.version.opt =
|
|
# in time, there should be no exceptions to -Xlint:all
|
|
-javac.lint.opts = -Xlint:all,-deprecation -Werror
|
|
+javac.lint.opts = -Xlint:all,-deprecation,-overrides -Werror
|
|
|
|
# options for the <javadoc> task for javac
|
|
#javadoc.jls3.url=http://java.sun.com/docs/books/jls/
|