changeset in /hg/icedtea: 2008-02-05 Bernhard Rosenkr?nzer <be...
Lillian Angel
langel at redhat.com
Tue Feb 5 06:56:07 PST 2008
changeset 942c462067e4 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=942c462067e4
description:
2008-02-05 Bernhard Rosenkr?nzer <bero at arklinux.org>
* configure.ac: Added check for jar. If fastjar is not found, then jar
is used.
* configure: Regenerate.
* patches/icedtea-gcc-4.3.patch: New patch for gcc 4.3.
2008-02-05 Lillian Angel <langel at redhat.com>
Fixes Bug #96
* Makefile.am
(clean-tools): Added clean-hotspot-tools to dependencies.
(ICEDTEA_PATCHES): Added gcc 4.3 patches.
(INSTALL): Updated for libgcj-4.3.0.
* Makefile.in: Regenerate.
* acinclude.m4: Updated for libgcj-4.3.0.jar.
* AUTHORS: Added Bernhard Rosenkr?nzer.
diffstat:
9 files changed, 180 insertions(+), 65 deletions(-)
AUTHORS | 1
ChangeLog | 18 ++++++
INSTALL | 4 -
Makefile.am | 8 +--
Makefile.in | 9 ++-
acinclude.m4 | 8 +--
configure | 107 +++++++++++++++++++++--------------------
configure.ac | 6 +-
patches/icedtea-gcc-4.3.patch | 84 ++++++++++++++++++++++++++++++++
diffs (472 lines):
diff -r 94b86ca839e4 -r 942c462067e4 AUTHORS
--- a/AUTHORS Sat Feb 02 17:55:55 2008 -0500
+++ b/AUTHORS Tue Feb 05 09:53:53 2008 -0500
@@ -12,6 +12,7 @@ Francis Kung <fkung at redhat.com>
Francis Kung <fkung at redhat.com>
Casey Marshall <csm at gnu.org>
Raif Naffah <admin at naffah-raif.name>
+Bernhard Rosenkränzer <bero at arklinux.org>
Keith Seitz <keiths at redhat.com>
Joshua Sumali <jsumali at redhat.com>
Christian Thalinger <twisti at complang.tuwien.ac.at>
diff -r 94b86ca839e4 -r 942c462067e4 ChangeLog
--- a/ChangeLog Sat Feb 02 17:55:55 2008 -0500
+++ b/ChangeLog Tue Feb 05 09:53:53 2008 -0500
@@ -1,3 +1,21 @@ 2008-02-01 Gary Benson <gbenson at redhat
+2008-02-05 Bernhard Rosenkränzer <bero at arklinux.org>
+
+ * configure.ac: Added check for jar. If fastjar is not found, then jar
+ is used.
+ * configure: Regenerate.
+ * patches/icedtea-gcc-4.3.patch: New patch for gcc 4.3.
+
+2008-02-05 Lillian Angel <langel at redhat.com>
+
+ Fixes Bug #96
+ * Makefile.am
+ (clean-tools): Added clean-hotspot-tools to dependencies.
+ (ICEDTEA_PATCHES): Added gcc 4.3 patches.
+ (INSTALL): Updated for libgcj-4.3.0.
+ * Makefile.in: Regenerate.
+ * acinclude.m4: Updated for libgcj-4.3.0.jar.
+ * AUTHORS: Added Bernhard Rosenkränzer.
+
2008-02-01 Gary Benson <gbenson at redhat.com>
* patches/icedtea-lib64.patch: Fixed to silence warning.
diff -r 94b86ca839e4 -r 942c462067e4 INSTALL
--- a/INSTALL Sat Feb 02 17:55:55 2008 -0500
+++ b/INSTALL Tue Feb 05 09:53:53 2008 -0500
@@ -7,8 +7,8 @@ a default location.
The build requirements are as follows:
-GNU libgcj 4.1.2
-Eclipse Java Compiler 3.2.1
+GNU libgcj 4.3.0
+Eclipse Java Compiler
CUPS
libX11 (libXp, libXtst, libXi, libXt)
lesstif
diff -r 94b86ca839e4 -r 942c462067e4 Makefile.am
--- a/Makefile.am Sat Feb 02 17:55:55 2008 -0500
+++ b/Makefile.am Tue Feb 05 09:53:53 2008 -0500
@@ -7,7 +7,8 @@ all-local: icedtea-against-icedtea
distclean-local: clean-copy
rm -rf stamps
- rm -f rt-source-files.txt tools-source-files.txt
+ rm -f rt-source-files.txt tools-source-files.txt \
+ hotspot-tools-source-files.txt
rm -rf bootstrap
rm -rf lib
rm -rf openjdk-ecj
@@ -24,7 +25,7 @@ install:
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
clean-tools-jar clean-tools clean-shared-objects \
- clean-copy clean-rt clean-gcjwebplugin clean-tools \
+ clean-copy clean-hotspot-tools clean-rt clean-gcjwebplugin \
hotspot hotspot-helper
EXTRA_DIST = rt generated $(ICEDTEA_PATCHES) $(ICEDTEA_ECJ_PATCH) \
@@ -219,6 +220,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero.patch \
+ patches/icedtea-gcc-4.3.patch \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
@@ -520,7 +522,7 @@ clean-plugs: clean-plugs clean-shared-ob
rm -f stamps/plugs.stamp
rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-clean-tools-jar: clean-tools-jar clean-tools
+clean-tools-jar: clean-hotspot-tools clean-tools
rm -f stamps/hotspot-tools.stamp
rm -rf tools/
rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
diff -r 94b86ca839e4 -r 942c462067e4 Makefile.in
--- a/Makefile.in Sat Feb 02 17:55:55 2008 -0500
+++ b/Makefile.in Tue Feb 05 09:53:53 2008 -0500
@@ -145,6 +145,7 @@ abs_top_srcdir = @abs_top_srcdir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
+ac_ct_FASTJAR = @ac_ct_FASTJAR@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -318,6 +319,7 @@ ICEDTEA_PATCHES = \
patches/icedtea-generated.patch \
patches/icedtea-lib64.patch \
patches/icedtea-zero.patch \
+ patches/icedtea-gcc-4.3.patch \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
@@ -639,7 +641,8 @@ all-local: icedtea-against-icedtea
distclean-local: clean-copy
rm -rf stamps
- rm -f rt-source-files.txt tools-source-files.txt
+ rm -f rt-source-files.txt tools-source-files.txt \
+ hotspot-tools-source-files.txt
rm -rf bootstrap
rm -rf lib
rm -rf openjdk-ecj
@@ -656,7 +659,7 @@ install:
clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
clean-tools-jar clean-tools clean-shared-objects \
- clean-copy clean-rt clean-gcjwebplugin clean-tools \
+ clean-copy clean-hotspot-tools clean-rt clean-gcjwebplugin \
hotspot hotspot-helper
env:
@@ -1002,7 +1005,7 @@ clean-plugs: clean-plugs clean-shared-ob
rm -f stamps/plugs.stamp
rm -f bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
-clean-tools-jar: clean-tools-jar clean-tools
+clean-tools-jar: clean-hotspot-tools clean-tools
rm -f stamps/hotspot-tools.stamp
rm -rf tools/
rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
diff -r 94b86ca839e4 -r 942c462067e4 acinclude.m4
--- a/acinclude.m4 Sat Feb 02 17:55:55 2008 -0500
+++ b/acinclude.m4 Tue Feb 05 09:53:53 2008 -0500
@@ -210,12 +210,12 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
])
if test -z "${LIBGCJ_JAR}"; then
AC_MSG_CHECKING(for libgcj-4.1.2.jar)
- if test -e "/usr/share/java/libgcj-4.1.2.jar"; then
- LIBGCJ_JAR=/usr/share/java/libgcj-4.1.2.jar
+ if test -e "/usr/share/java/libgcj-4.3.0.jar"; then
+ LIBGCJ_JAR=/usr/share/java/libgcj-4.3.0.jar
AC_MSG_RESULT(${LIBGCJ_JAR})
else
- if test -e "/usr/share/java/libgcj-4.1.jar"; then
- LIBGCJ_JAR=/usr/share/java/libgcj-4.1.jar
+ if test -e "/usr/share/java/libgcj-4.3.jar"; then
+ LIBGCJ_JAR=/usr/share/java/libgcj-4.3.jar
AC_MSG_RESULT(${LIBGCJ_JAR})
else
AC_MSG_RESULT(no)
diff -r 94b86ca839e4 -r 942c462067e4 configure
--- a/configure Sat Feb 02 17:55:55 2008 -0500
+++ b/configure Tue Feb 05 09:53:53 2008 -0500
@@ -710,6 +710,7 @@ UNZIP
UNZIP
CHMOD
FASTJAR
+ac_ct_FASTJAR
GAWK
SYSTEM_GCJ_DIR
SYSTEM_ICEDTEA_DIR
@@ -4593,26 +4594,26 @@ echo "$as_me: error: chmod program not f
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}fastjar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}fastjar; ac_word=$2
+ for ac_prog in fastjar jar
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_FASTJAR+set}" = set; then
+if test "${ac_cv_prog_FASTJAR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $FASTJAR in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_FASTJAR="$FASTJAR" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$FASTJAR"; then
+ ac_cv_prog_FASTJAR="$FASTJAR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_FASTJAR="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_prog_FASTJAR="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4620,10 +4621,9 @@ done
done
IFS=$as_save_IFS
- ;;
-esac
-fi
-FASTJAR=$ac_cv_path_FASTJAR
+fi
+fi
+FASTJAR=$ac_cv_prog_FASTJAR
if test -n "$FASTJAR"; then
{ echo "$as_me:$LINENO: result: $FASTJAR" >&5
echo "${ECHO_T}$FASTJAR" >&6; }
@@ -4633,29 +4633,31 @@ fi
fi
-fi
-if test -z "$ac_cv_path_FASTJAR"; then
- ac_pt_FASTJAR=$FASTJAR
- # Extract the first word of "fastjar", so it can be a program name with args.
-set dummy fastjar; ac_word=$2
+ test -n "$FASTJAR" && break
+ done
+fi
+if test -z "$FASTJAR"; then
+ ac_ct_FASTJAR=$FASTJAR
+ for ac_prog in fastjar jar
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_ac_pt_FASTJAR+set}" = set; then
+if test "${ac_cv_prog_ac_ct_FASTJAR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $ac_pt_FASTJAR in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_FASTJAR="$ac_pt_FASTJAR" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$ac_ct_FASTJAR"; then
+ ac_cv_prog_ac_ct_FASTJAR="$ac_ct_FASTJAR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_FASTJAR="$as_dir/$ac_word$ac_exec_ext"
+ ac_cv_prog_ac_ct_FASTJAR="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -4663,19 +4665,22 @@ done
done
IFS=$as_save_IFS
- ;;
-esac
-fi
-ac_pt_FASTJAR=$ac_cv_path_ac_pt_FASTJAR
-if test -n "$ac_pt_FASTJAR"; then
- { echo "$as_me:$LINENO: result: $ac_pt_FASTJAR" >&5
-echo "${ECHO_T}$ac_pt_FASTJAR" >&6; }
+fi
+fi
+ac_ct_FASTJAR=$ac_cv_prog_ac_ct_FASTJAR
+if test -n "$ac_ct_FASTJAR"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_FASTJAR" >&5
+echo "${ECHO_T}$ac_ct_FASTJAR" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
- if test "x$ac_pt_FASTJAR" = x; then
+
+ test -n "$ac_ct_FASTJAR" && break
+done
+
+ if test "x$ac_ct_FASTJAR" = x; then
FASTJAR=""
else
case $cross_compiling:$ac_tool_warned in
@@ -4688,18 +4693,15 @@ configuration is useful to you, please w
configuration is useful to you, please write to autoconf at gnu.org." >&2;}
ac_tool_warned=yes ;;
esac
- FASTJAR=$ac_pt_FASTJAR
- fi
-else
- FASTJAR="$ac_cv_path_FASTJAR"
-fi
-
- if test x"$FASTJAR" = x ; then
- { { echo "$as_me:$LINENO: error: fastjar program not found in PATH" >&5
-echo "$as_me: error: fastjar program not found in PATH" >&2;}
+ FASTJAR=$ac_ct_FASTJAR
+ fi
+fi
+
+if test "x$FASTJAR" = x; then
+ { { echo "$as_me:$LINENO: error: Can't find fastjar or jar" >&5
+echo "$as_me: error: Can't find fastjar or jar" >&2;}
{ (exit 1); exit 1; }; }
- fi
-
+fi
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gawk", so it can be a program name with args.
@@ -6575,13 +6577,13 @@ fi
if test -z "${LIBGCJ_JAR}"; then
{ echo "$as_me:$LINENO: checking for libgcj-4.1.2.jar" >&5
echo $ECHO_N "checking for libgcj-4.1.2.jar... $ECHO_C" >&6; }
- if test -e "/usr/share/java/libgcj-4.1.2.jar"; then
- LIBGCJ_JAR=/usr/share/java/libgcj-4.1.2.jar
+ if test -e "/usr/share/java/libgcj-4.3.0.jar"; then
+ LIBGCJ_JAR=/usr/share/java/libgcj-4.3.0.jar
{ echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5
echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
else
- if test -e "/usr/share/java/libgcj-4.1.jar"; then
- LIBGCJ_JAR=/usr/share/java/libgcj-4.1.jar
+ if test -e "/usr/share/java/libgcj-4.3.jar"; then
+ LIBGCJ_JAR=/usr/share/java/libgcj-4.3.jar
{ echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5
echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
else
@@ -10770,8 +10772,8 @@ UNZIP!$UNZIP$ac_delim
UNZIP!$UNZIP$ac_delim
CHMOD!$CHMOD$ac_delim
FASTJAR!$FASTJAR$ac_delim
+ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
GAWK!$GAWK$ac_delim
-SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -10813,6 +10815,7 @@ ac_delim='%!_!# '
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
SYSTEM_ANT_DIR!$SYSTEM_ANT_DIR$ac_delim
ENABLE_PLUGIN!$ENABLE_PLUGIN$ac_delim
@@ -10855,7 +10858,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 40; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -r 94b86ca839e4 -r 942c462067e4 configure.ac
--- a/configure.ac Sat Feb 02 17:55:55 2008 -0500
+++ b/configure.ac Tue Feb 05 09:53:53 2008 -0500
@@ -14,7 +14,11 @@ FIND_TOOL([ZIP], [zip])
FIND_TOOL([ZIP], [zip])
FIND_TOOL([UNZIP], [unzip])
FIND_TOOL([CHMOD], [chmod])
-FIND_TOOL([FASTJAR], [fastjar])
+AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
+if test "x$FASTJAR" = x; then
+ AC_MSG_ERROR([Can't find fastjar or jar])
+fi
+AC_SUBST([FASTJAR])
dnl OpenJDK's README-builds.html lists gawk as a build dependency so we
dnl check for it explicitly rather than using AC_PROG_AWK.
FIND_TOOL([GAWK], [gawk])
diff -r 94b86ca839e4 -r 942c462067e4 generated/sun/awt/X11/generator/sizer.32
Binary file generated/sun/awt/X11/generator/sizer.32 has changed
diff -r 94b86ca839e4 -r 942c462067e4 patches/icedtea-gcc-4.3.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-gcc-4.3.patch Tue Feb 05 09:53:53 2008 -0500
@@ -0,0 +1,84 @@
+--- openjdk/hotspot/src/share/vm/adlc/adlc.hpp.ark 2008-01-11 14:15:41.000000000 +0000
++++ openjdk/hotspot/src/share/vm/adlc/adlc.hpp 2008-01-11 14:16:14.000000000 +0000
+@@ -29,7 +29,7 @@
+ // standard library constants
+ #include "stdio.h"
+ #include "stdlib.h"
+-#if _MSC_VER >= 1300 // Visual C++ 7.0 or later
++#if (defined(__GNUC__) && __GNUC__ >= 3) || (_MSC_VER >= 1300) // gcc 3.0 or later or Visual C++ 7.0 or later
+ #include <iostream>
+ #else
+ #include <iostream.h>
+--- openjdk/hotspot/src/share/vm/adlc/filebuff.cpp.ark 2008-01-11 14:17:17.000000000 +0000
++++ openjdk/hotspot/src/share/vm/adlc/filebuff.cpp 2008-01-11 14:17:34.000000000 +0000
+@@ -25,6 +25,8 @@
+ // FILEBUFF.CPP - Routines for handling a parser file buffer
+ #include "adlc.hpp"
+
++using namespace std;
++
+ //------------------------------FileBuff---------------------------------------
+ // Create a new parsing buffer
+ FileBuff::FileBuff( BufferedFile *fptr, ArchDesc& archDesc) : _fp(fptr), _AD(archDesc) {
+--- openjdk/hotspot/src/share/vm/adlc/filebuff.hpp.ark 2008-01-11 14:14:45.000000000 +0000
++++ openjdk/hotspot/src/share/vm/adlc/filebuff.hpp 2008-01-11 14:15:34.000000000 +0000
+@@ -24,7 +24,7 @@
+
+ // FILEBUFF.HPP - Definitions for parser file buffering routines
+
+-#if _MSC_VER >= 1300 // Visual C++ 7.0 or later
++#if (defined(__GNUC__) && __GNUC__ >= 3) || (_MSC_VER >= 1300) // gcc 3.0 or later, or Visual C++ 7.0 or later
+ #include <iostream>
+ #else
+ #include <iostream.h>
+@@ -96,8 +96,11 @@
+ FileBuffRegion *copy(); // Deep copy
+ FileBuffRegion *merge(FileBuffRegion*); // Merge 2 regions; delete input
+
+-// void print(std::ostream&);
+-// friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
++#if defined(__GNUC__) && __GNUC__ >= 3
++ void print(std::ostream&);
++ friend std::ostream& operator<< (std::ostream&, FileBuffRegion&);
++#else
+ void print(ostream&);
+ friend ostream& operator<< (ostream&, FileBuffRegion&);
++#endif
+ };
+--- openjdk/hotspot/build/linux/makefiles/gcc.make.ark 2008-01-11 14:24:05.000000000 +0000
++++ openjdk/hotspot/build/linux/makefiles/gcc.make 2008-01-11 14:24:27.000000000 +0000
+@@ -94,7 +94,8 @@
+ endif
+
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++# Commented out for now because of gcc 4.3 warnings OpenJDK isn't ready for
++#WARNINGS_ARE_ERRORS = -Werror
+ # Except for a few acceptable ones
+ ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+--- openjdk/hotspot/build/solaris/makefiles/gcc.make.ark 2008-01-11 14:24:33.000000000 +0000
++++ openjdk/hotspot/build/solaris/makefiles/gcc.make 2008-01-11 14:24:48.000000000 +0000
+@@ -109,7 +109,8 @@
+
+
+ # Compiler warnings are treated as errors
+-WARNINGS_ARE_ERRORS = -Werror
++# Commented out for now because of gcc 4.3 warnings OpenJDK isn't ready for
++# WARNINGS_ARE_ERRORS = -Werror
+ # Enable these warnings. See 'info gcc' about details on these options
+ ADDITIONAL_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ADDITIONAL_WARNINGS)
+--- openjdk/jdk/make/common/Defs-linux.gmk.ark 2008-01-11 14:20:26.000000000 +0000
++++ openjdk/jdk/make/common/Defs-linux.gmk 2008-01-11 14:21:10.000000000 +0000
+@@ -139,7 +139,9 @@
+ # Treat compiler warnings as errors, if warnings not allowed
+ #
+ ifeq ($(COMPILER_WARNINGS_FATAL),true)
+- GCC_WARNINGS += -Werror
++ # gcc 4.3 introduces new warnings OpenJDK code isn't quite ready for, such as
++ # "cast from double to float may chance its value". Let's ignore this for now.
++ # GCC_WARNINGS += -Werror
+ endif
+
+ #
More information about the distro-pkg-dev
mailing list