Hello community, here is the log from the commit of package java-1_6_0-openjdk for openSUSE:Factory checked in at 2012-01-27 15:17:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_6_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_6_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_6_0-openjdk", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2011-10-25 16:05:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_6_0-openjdk.new/java-1_6_0-openjdk.changes 2012-01-27 15:17:50.000000000 +0100 @@ -1,0 +2,43 @@ +Tue Jan 17 12:34:06 UTC 2012 - [email protected] + +- update to 1.10.5 (bugfix release) +* Backports + - S7034464: Support transparent large pages on Linux + - S7037939: NUMA: Disable adaptive resizing if SHM large pages are used + - S7102369: remove java.rmi.server.codebase property parsing from registyimpl + - S7094468: rmiregistry clean up + - S7103725, RH767129: REGRESSION - 6u29 breaks ssl connectivity using TLS_DH_anon_WITH_AES_128_CBC_SHA + - S6851973, PR830: ignore incoming channel binding if acceptor does not set one + - S7091528: javadoc attempts to parse .class files + +------------------------------------------------------------------- +Sat Dec 10 09:39:51 CET 2011 - [email protected] + +- adjusted patch110 to fix ppc build. + +------------------------------------------------------------------- +Fri Dec 9 08:20:01 UTC 2011 - [email protected] + +- there is no architecture called arm, so use macro instead + +------------------------------------------------------------------- +Thu Dec 8 10:18:51 UTC 2011 - [email protected] + +- fix a stuff needed for gjc-based build + * change compiler flags in configure to gjc compatible + * added no-werror patch for openjdk-ecj + * avoid all aditional checking packages in this mode + * temporary remove memory size increase + * exclude patch110 in this case - TBD later +- definitelly drop noarch feature as it never worked well +- add arm to 32bit architectures +- remove rhino as a runtime dependency, as it's repackaged and + installed in the jvm's tree +- enable build --with-parallel-jobs + +------------------------------------------------------------------- +Wed Nov 30 09:39:51 UTC 2011 - [email protected] + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- Old: ---- icedtea6-1.10.4.tar.gz New: ---- icedtea6-1.10.5.tar.gz openjdk-ecj-6-src-b22-no-werror.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.mViplj/_old 2012-01-27 15:17:54.000000000 +0100 +++ /var/tmp/diff_new_pack.mViplj/_new 2012-01-27 15:17:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package java-1_6_0-openjdk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,21 +28,21 @@ %endif %endif -# XXX: systemtap does not work with gcj %if %{gcjbootstrap} +# XXX: systemtap does not work with gcj %define with_systemtap 0 +# disable debug packages for gjc-based builds +%define suse_insert_debug_package %nil %endif # If runtests is 0 test suites will not be run. %define runtests 0 -%define icedteaver 1.10.4 +%define icedteaver 1.10.5 %define icedteasnapshot %{nil} %define openjdkver b22 %define openjdkdate 28_feb_2011 -%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/ - %define accessmajorver 1.23 %define accessminorver 0 %define accessver %{accessmajorver}.%{accessminorver} @@ -111,8 +111,6 @@ %define jrebindir %{_jvmdir}/%{jrelnk}/bin %define jvmjardir %{_jvmjardir}/%{sdkdir} %define jvmjarlink %{_jvmjardir}/%{sdklnk} -# For openSUSE >= 11.2 demo, sample and src.zip is noarch ==> share -%define sdkshare %{_datadir}/%{sdkname} %ifarch %{jit_arches} # Where to install systemtap tapset (links) @@ -132,26 +130,31 @@ Name: java-1_6_0-openjdk Version: 1.6.0.0_%{openjdkver}.%{icedteaver} -Release: 1 +Release: 0 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 +License: GPL-2.0 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Group: Development/Languages/Java -License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Url: http://openjdk.java.net/ Source0: %{url}icedtea6-%{icedteaver}%{icedteasnapshot}.tar.gz # # download the openjdk from http://download.java.net/openjdk/jdk6/promoted/latest/ # sh generate-fedora-zip.sh openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz Source1: %{fedorazip} -Source2: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2 -# wget http://cvs.fedoraproject.org/viewvc/devel/java-1.6.0-openjdk/generate-fedora-zip.sh?view=co -o generate-fedora-zip.sh -Source3: %{genurl}generate-fedora-zip.sh +#Source2: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.bz2 +Source2: java-access-bridge-%{accessver}.tar.bz2 +# http://pkgs.fedoraproject.org/gitweb/?p=java-1.6.0-openjdk.git;a=blob_plain;f=generate-fedora-zip.sh;h=67b1e89a86c53bfcb2b69e9169d0dc4c25325c11;hb=HEAD +Source3: generate-fedora-zip.sh # wget ftp://sources.redhat.com/pub/mauve/snapshot/mauve-nigthly.tar.bz mauve-%(date '+%Y-%m-%d').tar.bz2 Source5: mauve-%{mauvedate}.tar.bz2 # from Fedora rpm Source6: mauve_tests -Source7: %{hotspoturl}f0f676c5a2c6.tar.gz -Source8: %{jaxpurl}jaxp144_01.zip -Source9: %{jafurl}jdk6-jaf-b20.zip -Source10: %{jaxwsurl}jdk6-jaxws-b20.zip +#Source7: %{hotspoturl}f0f676c5a2c6.tar.gz +#Source8: %{jaxpurl}jaxp144_01.zip +#Source9: %{jafurl}jdk6-jaf-b20.zip +#Source10: %{jaxwsurl}jdk6-jaxws-b20.zip +Source7: f0f676c5a2c6.tar.gz +Source8: jaxp144_01.zip +Source9: jdk6-jaf-b20.zip +Source10: jdk6-jaxws-b20.zip Source1000: java-1_6_0-openjdk-rpmlintrc # those properties are for opeSUSE only Source1001: fontconfig.SuSE.properties @@ -203,11 +206,25 @@ # PATCH-FIX-UPSTREAM: http://icedtea.classpath.org/hg/icedtea6/rev/012505ce3d0d # fixes build on 11.1/i586 and sle11/i586, which fails because code behind GNU_stack.note in linux_x64_32.so Patch136: icedtea6-replace-gcc-stack-marking.patch +#PATCH-FIX-OPENSUSE: no -Werror on ecj based build as well +Patch137: openjdk-ecj-6-src-b22-no-werror.patch # PATCH-FIX-UPSTREAM bnc#524505 Patch1000: java-1_6_0-openjdk-suse-desktop-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build + +# we can simply skip the unwanted checks when bootstrapping package +# as openjdk build using gjc is sooooo complicated and slooow without it +%if %{gcjbootstrap} +BuildRequires: -brp-check-suse +BuildRequires: -post-build-checks +BuildRequires: -rpmlint-Factory +BuildRequires: -rpmlint-mini +%endif + +BuildRequires: automake BuildRequires: alsa-lib-devel -BuildRequires: quilt vim +BuildRequires: quilt +BuildRequires: vim BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: giflib-devel @@ -225,9 +242,11 @@ BuildRequires: ant-nodeps BuildRequires: zip %if %{gcjbootstrap} -BuildRequires: ecj-bootstrap java-1_5_0-gcj-compat-devel +BuildRequires: ecj-bootstrap +BuildRequires: java-1_5_0-gcj-compat-devel %else -BuildRequires: java-1_6_0-openjdk java-1_6_0-openjdk-devel +BuildRequires: java-1_6_0-openjdk +BuildRequires: java-1_6_0-openjdk-devel %endif BuildRequires: mozilla-nss-devel @@ -291,7 +310,6 @@ BuildRequires: openssl-certs %endif -Requires: rhino # Require jpackage-utils for ant. Requires: jpackage-utils >= 1.7.3 # Require zoneinfo data provided by tzdata-java subpackage. @@ -341,7 +359,7 @@ Provides: jre1.6.x # bnc#542545 # 32-bit versus 64-bit specific provides: -%ifarch %ix86 ppc s390 +%ifarch %ix86 ppc s390 %{arm} %define bits 32 %endif %ifarch x86_64 ia64 s390x @@ -370,9 +388,7 @@ %package devel -License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception Summary: Java SDK based on OpenJDK 6 and IcedTea 6 -Group: Development/Languages/Java Requires: %{name} = %{version}-%{release} Requires(pre): %{_sbindir}/update-alternatives Provides: java-1.6.0-openjdk-devel = %{version}-%{release} @@ -399,15 +415,10 @@ %package demo -License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: Summary: Sources for building demo applications with OpenJDK 6 -Group: Development/Languages/Java Provides: java-1.6.0-openjdk-demo = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description demo This package provides sources of demonstration applications for OpenJDK @@ -417,14 +428,9 @@ %package src -License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: Summary: OpenJDK 6 Java class sources for developers -Group: Development/Languages/Java Requires: %{name}-devel = %{version}-%{release} -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description src This package provides Java Runtime librarcy class sources of OpenJDK 6 @@ -434,17 +440,12 @@ %package javadoc -License: GPLv2 ; - with the OpenJDK Assembly Exception and the GNU Classpath Exception # As 1.6.0 is stable, obsolete java-1_7_0-icedtea in openSUSE 11.0 and earlier: Summary: Documentation of the Java API of OpenJDK 6 -Group: Development/Languages/Java Requires(pre): %{_sbindir}/update-alternatives Provides: java-1.6.0-openjdk-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} Provides: java-%{javaver}-javadoc = %{version}-%{release} -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description javadoc This package provides documentation of the API provided by OpenJDK 6 @@ -467,6 +468,16 @@ %build export LANG=en_US.UTF-8 ./autogen.sh + +%if %{gcjbootstrap} +# XXX: use gcj-compatible switches for configure +sed -i "s/$JAVAC -cp/$JAVAC -C --classpath/;s/-source 5//" configure +%endif + +# macro _smp_mflags is too makefile centric, so it's better +# get the number directly +export NUMCPUS=`/usr/bin/getconf _NPROCESSORS_ONLN` + %{configure} \ %ifarch %{jit_arches} %if 0%{?suse_version} >= 1120 @@ -487,20 +498,27 @@ --with-jaxp-drop-zip=%{SOURCE8} \ --with-jaxws-drop-zip=%{SOURCE10} \ %if %{gcjbootstrap} - --with-gcj-home=%{_jvmdir}/java-gcj \ + --with-gcj=%{_bindir}/gcj \ + --with-jdk-home=%{_jvmdir}/java-1.5.0-gcj \ %else --with-jdk-home=%{_jvmdir}/%{sdkdir} \ --disable-bootstrap \ %endif --with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \ --with-openjdk-src-zip=%{SOURCE1} \ +%ifnarch %{arm} + --with-parallel-jobs=${NUMCPUS} \ +%endif --with-pkgversion=suse-%{release}-%{_arch} -sed -i 's/MEMORY_LIMIT = -J-Xmx512m/MEMORY_LIMIT = -J-Xmx768m/' Makefile +#FIXME: maybe it's no longer needed, but let's not remove it +#sed -i 's/MEMORY_LIMIT = -J-Xmx512m/MEMORY_LIMIT = -J-Xmx768m/' Makefile + %if %{gcjbootstrap} make stamps/patch-ecj.stamp %endif make patch + # Those patches are from Fedora package patch -l -p0 -i %{PATCH3} patch -l -p0 -i %{PATCH4} @@ -519,8 +537,11 @@ %ifarch %ix86 qpatch -p0 %{PATCH109} %endif + +%if ! %{gcjbootstrap} %ifarch ppc ppc64 -qpatch -p0 %{PATCH110} +qpatch -p1 %{PATCH110} +%endif %endif for PATCH in \ @@ -536,6 +557,7 @@ %{PATCH132} \ %{PATCH134} \ %{PATCH133} \ + %{PATCH137} \ %endif %if 0%{?suse_version} >= 1120 %{PATCH135} \ @@ -619,14 +641,6 @@ # Install main files. install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} cp -a bin include lib src.zip $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} - # noarch sub packages in openSUSE >= 11.2 - %if 0%{?suse_version} >= 1120 - install -d -m 755 $RPM_BUILD_ROOT%{sdkshare} - pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} - mv src.zip $RPM_BUILD_ROOT%{sdkshare} - ln -sf %{sdkshare}/src.zip - popd - %endif install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} # bnc#438674 @@ -697,24 +711,6 @@ [ -f bin/java-rmi.cgi ] && mv bin/java-rmi.cgi sample/rmi cp -a sample $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} - # noarch sub packages in openSUSE >= 11.2 - %if 0%{?suse_version} >= 1120 - pushd $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir} - # samples can go all - mv sample $RPM_BUILD_ROOT%{sdkshare} - ln -sf %{sdkshare}/sample - - # leave the demo/jvmti in the -devel package in %{_libdir} - contains .so files - install -d -m 0755 $RPM_BUILD_ROOT%{sdkshare}/demo - DEMODIRS=$(ls -1d demo/* | grep -v jvmti) - mv $DEMODIRS $RPM_BUILD_ROOT%{sdkshare}/demo - pushd demo - for dir in $DEMODIRS; do - ln -sf %{sdkshare}/$dir - done - popd - popd - %endif popd # Install Javadoc documentation. install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} @@ -770,22 +766,11 @@ | sed 's|'$RPM_BUILD_ROOT'||' \ | sed 's|^|%doc |' \ >> %{name}-demo.files - # noarch sub packages in openSUSE >= 11.2 - %if 0%{?suse_version} >= 1120 - sed -i -e 's#%{_jvmdir}/%{sdkdir}#%{sdkshare}#' %{name}-demo.files - # also move the jvmti content to the -devel - sed -i '/jvmti/d' %{name}-demo.files - %endif # fdupes links the files from JDK to JRE, so it breaks a JRE # use it carefully :)) %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{jredir}/ -# noarch sub packages in openSUSE >= 11.2 -%if 0%{?suse_version} >= 1120 -%fdupes -s $RPM_BUILD_ROOT/%{sdkshare} -%endif - %fdupes -s $RPM_BUILD_ROOT/%{_jvmdir}/%{sdkdir}/demo %fdupes -s $RPM_BUILD_ROOT%{_javadocdir}/%{sdkname} @@ -1028,13 +1013,6 @@ %config(noreplace) %{_jvmdir}/%{jredir}/lib/management/jmxremote.access %config(noreplace) %{_jvmdir}/%{jredir}/lib/management/management.properties %config(noreplace) %{_jvmdir}/%{jredir}/lib/images/cursors/cursors.properties -%if %{suse_version} >= 1120 -# links to the demo and sample dirs in noarch subpackages -%{_jvmdir}/%{sdkdir}/demo -%{_jvmdir}/%{sdkdir}/sample -%{_jvmdir}/%{sdkdir}/src.zip -%dir %{sdkshare} -%endif %{_mandir}/man1/java-%{sdkname}.1* %{_mandir}/man1/keytool-%{sdkname}.1* %{_mandir}/man1/orbd-%{sdkname}.1* @@ -1071,11 +1049,6 @@ %{_jvmdir}/%{sdkdir}/lib/* %{_jvmdir}/%{sdklnk} %{jvmjarlink} -# noarch sub packages in openSUSE >= 11.2 -%if 0%{?suse_version} >= 1120 -%dir %{_jvmdir}/%{sdkdir}/demo -%{_jvmdir}/%{sdkdir}/demo/jvmti -%endif # bnc#525097 %{_datadir}/applications/jconsole.desktop %{_mandir}/man1/appletviewer-%{sdkname}.1* @@ -1114,12 +1087,7 @@ %files src %defattr(-,root,root,-) -# noarch sub packages in openSUSE >= 11.2 -%if 0%{?suse_version} >= 1120 -%{sdkshare}/src.zip -%else %{_jvmdir}/%{sdkdir}/src.zip -%endif #doc mauve_tests #doc mauve-%{mauvedate}/mauve_output ++++++ icedtea6-1.10.4.tar.gz -> icedtea6-1.10.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-1_6_0-openjdk/icedtea6-1.10.4.tar.gz /work/SRC/openSUSE:Factory/.java-1_6_0-openjdk.new/icedtea6-1.10.5.tar.gz differ: char 5, line 1 ++++++ openjdk-6-src-b17-no-return-in-nonvoid-function-ppc.patch ++++++ --- /var/tmp/diff_new_pack.mViplj/_old 2012-01-27 15:17:54.000000000 +0100 +++ /var/tmp/diff_new_pack.mViplj/_new 2012-01-27 15:17:54.000000000 +0100 @@ -110,32 +110,6 @@ } int AbstractInterpreter::size_activation(methodOop method, -Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp -=================================================================== ---- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp -+++ icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/interpreter_zero.hpp -@@ -41,6 +41,7 @@ - static int expr_tag_index_at(int i) { - assert(TaggedStackInterpreter, "should not call this"); - Unimplemented(); -+ return 0; // make gcc happy - } - - static int expr_offset_in_bytes(int i) { -@@ -49,6 +50,7 @@ - static int expr_tag_offset_in_bytes(int i) { - assert(TaggedStackInterpreter, "should not call this"); - Unimplemented(); -+ return 0; // make gcc happy - } - - static int local_index_at(int i) { -@@ -58,4 +60,5 @@ - static int local_tag_index_at(int i) { - assert(TaggedStackInterpreter, "should not call this"); - Unimplemented(); -+ return 0; // make gcc happy - } Index: icedtea6-1.8.1/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp =================================================================== --- icedtea6-1.8.1.orig/openjdk/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp @@ -399,14 +373,6 @@ } #ifdef HOTSPOT_ASM -@@ -234,6 +239,7 @@ JVM_handle_linux_signal(int sig, - - sprintf(buf, fmt, sig); - fatal(buf); -+ return 0; // make gcc happy - } - - void os::Linux::init_thread_fpu_state(void) { @@ -242,6 +248,7 @@ void os::Linux::init_thread_fpu_state(vo int os::Linux::get_fpu_control_word() { ++++++ openjdk-ecj-6-src-b22-no-werror.patch ++++++ Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make +++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/adlc.make @@ -60,8 +60,8 @@ CPPFLAGS += -DASSERT # CFLAGS_WARN holds compiler options to suppress/enable warnings. # Compiler warnings are treated as errors -CFLAGS_WARN = -Werror -CFLAGS += $(CFLAGS_WARN) +#CFLAGS_WARN = -Werror +#CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ adlparse.o \ Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make +++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/linux/makefiles/gcc.make @@ -135,7 +135,7 @@ else ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare endif -CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) +CFLAGS_WARN/DEFAULT = $(ACCEPTABLE_WARNINGS) # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) Index: icedtea6-1.10.4/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make +++ icedtea6-1.10.4/openjdk-ecj/hotspot/make/solaris/makefiles/gcc.make @@ -116,7 +116,7 @@ endif 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) +CFLAGS_WARN/DEFAULT = $(ADDITIONAL_WARNINGS) # Special cases CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) Index: icedtea6-1.10.4/openjdk-ecj/corba/make/common/Defs-linux.gmk =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/corba/make/common/Defs-linux.gmk +++ icedtea6-1.10.4/openjdk-ecj/corba/make/common/Defs-linux.gmk @@ -143,9 +143,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed # -ifeq ($(COMPILER_WARNINGS_FATAL),true) - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) +# GCC_WARNINGS += -Werror +#endif # # Misc compiler options Index: icedtea6-1.10.4/openjdk-ecj/jdk/make/common/Defs-linux.gmk =================================================================== --- icedtea6-1.10.4.orig/openjdk-ecj/jdk/make/common/Defs-linux.gmk +++ icedtea6-1.10.4/openjdk-ecj/jdk/make/common/Defs-linux.gmk @@ -153,9 +153,9 @@ GCC_WARNINGS = -W -Wall $(GCC_STYLE) $(G # # Treat compiler warnings as errors, if warnings not allowed # -ifeq ($(COMPILER_WARNINGS_FATAL),true) - GCC_WARNINGS += -Werror -endif +#ifeq ($(COMPILER_WARNINGS_FATAL),true) +# GCC_WARNINGS += -Werror +#endif # # Misc compiler options -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
