Bommels05/BefatorNix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
BefatorNix/jdk/jdk6.patch
Some One c2c92aa452 java work
2025-09-05 17:38:49 +02:00

206 lines
8.5 KiB
Diff
Raw Blame History

diff --git a/corba/make/common/shared/Defs-linux.gmk b/corba/make/common/shared/Defs-linux.gmk
index c9b931f6..57008bda 100644
--- a/corba/make/common/shared/Defs-linux.gmk
+++ b/corba/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
# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
@@ -107,7 +107,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/corba/make/common/shared/Defs-utils.gmk b/corba/make/common/shared/Defs-utils.gmk
index e098af76..92b6861d 100644
--- a/corba/make/common/shared/Defs-utils.gmk
+++ b/corba/make/common/shared/Defs-utils.gmk
@@ -178,7 +178,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 (only sccs is not)
AR = $(UTILS_USR_BIN_PATH)ar
AS = $(UTILS_USR_BIN_PATH)as
diff --git a/corba/make/sun/rmi/corbalogsources/Makefile b/corba/make/sun/rmi/corbalogsources/Makefile
index 25ca911f..81c83b6b 100644
--- a/corba/make/sun/rmi/corbalogsources/Makefile
+++ b/corba/make/sun/rmi/corbalogsources/Makefile
@@ -82,7 +82,11 @@ MC_CLASSPATH=$(BUILDTOOLJARDIR)/MC.jar
MCJ_GENERATE_CLASS = $(BOOT_JAVA_CMD) \
-cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_CLASS)
MCJ_GENERATE_LOG_RB = $(BOOT_JAVA_CMD) \
- -cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB)
+ -cp "$(MC_CLASSPATH)" com.sun.tools.corba.se.logutil.MC $(MC_GENERATE_LOG_RB)
+
+IDLJ_CLASSPATH=$(BUILDTOOLJARDIR)/idlj.jar:$(BUILDTOOLJARDIR)/../btclasses/
+IDLJ = $(BOOT_JAVA_CMD) \
+ -cp "$(IDLJ_CLASSPATH)" com.sun.tools.corba.se.idl.toJavaPortable.Compile
#
diff --git a/hotspot/make/linux/Makefile b/hotspot/make/linux/Makefile
index 67751af3..dc5d6820 100644
--- a/hotspot/make/linux/Makefile
+++ b/hotspot/make/linux/Makefile
@@ -249,7 +249,6 @@ check_j2se_version:
$(REMOTE) $(RUN.JAVA) -version; \
echo "*** An XSLT processor (J2SE 1.4.x or newer) is required" \
"to bootstrap this build" 1>&2; \
- exit 1; \
fi
$(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
diff --git a/jdk/make/common/shared/Defs-linux.gmk b/jdk/make/common/shared/Defs-linux.gmk
index 12d8e13b..e12231c5 100644
--- a/jdk/make/common/shared/Defs-linux.gmk
+++ b/jdk/make/common/shared/Defs-linux.gmk
@@ -77,7 +77,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.
@@ -85,7 +85,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
@@ -115,7 +115,7 @@ endif
ifneq "$(origin ALT_COMPILER_PATH)" "undefined"
COMPILER_PATH :=$(call PrefixPath,$(ALT_COMPILER_PATH))
else
- COMPILER_PATH =/usr/bin/
+ COMPILER_PATH =
endif
# DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
@@ -123,7 +123,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 b44f1efe..5bbc050e 100644
--- a/jdk/make/common/shared/Defs-utils.gmk
+++ b/jdk/make/common/shared/Defs-utils.gmk
@@ -180,7 +180,7 @@ ifeq ($(PLATFORM),linux)
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 (only sccs is not)
AR = $(UTILS_USR_BIN_PATH)ar
AS = $(UTILS_USR_BIN_PATH)as
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
index 64d5f442..1bd0695e 100644
--- a/jdk/make/common/shared/Sanity.gmk
+++ b/jdk/make/common/shared/Sanity.gmk
@@ -108,8 +108,8 @@ ifeq ($(PLATFORM), linux)
if [ "$(OS_VARIANT_NAME)" = "Fedora" ] ; then \
$(CAT) /etc/fedora-release | $(HEAD) -1 | $(NAWK) '{ print $$3; }' ; \
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 1e7d5494..b6606acc 100644
--- a/jdk/make/tools/freetypecheck/freetypecheck.c
+++ b/jdk/make/tools/freetypecheck/freetypecheck.c
@@ -36,7 +36,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));
@@ -48,7 +48,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.xml b/langtools/make/build.xml
index 9b6c1731..3240b152 100644
--- a/langtools/make/build.xml
+++ b/langtools/make/build.xml
@@ -525,7 +525,6 @@
source="@{javac.source}"
target="@{javac.target}">
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
- <compilerarg line="${javac.version.opt}"/>
<compilerarg line="-Xlint"/>
</javac>
<javac fork="true"
@@ -543,8 +542,6 @@
<compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
<compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
<compilerarg line="${javac.no.jdk.warnings}"/>
- <compilerarg line="${javac.version.opt}"/>
- <compilerarg line="${javac.lint.opts}"/>
</javac>
<copy todir="@{classes.dir}">
<fileset dir="${src.classes.dir}">
diff --git a/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java b/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
index 24de0d6c..036dd680 100644
--- a/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocImpl.java
@@ -103,7 +103,6 @@ public abstract class DocImpl implements Doc, Comparable<Object> {
String d = documentation();
if (env.javaScriptScanner != null) {
env.javaScriptScanner.parse(d, new JavaScriptScanner.Reporter() {
- @Override
public void report() {
env.error(DocImpl.this, "javadoc.JavaScript_in_comment");
throw new FatalError();
Reference in New Issue View Git Blame Copy Permalink