- Backport fix by Andrew Haley for build problems related with the

bootstrap ClassLoader.
This commit is contained in:
aoliva 2006-07-25 18:27:23 +00:00
parent 08ed3d428d
commit 531723aa9b
1 changed files with 8 additions and 2 deletions

View File

@ -1,6 +1,6 @@
%define DATE 20060721 %define DATE 20060721
%define gcc_version 4.1.1 %define gcc_version 4.1.1
%define gcc_release 12 %define gcc_release 13
%define _unpackaged_files_terminate_build 0 %define _unpackaged_files_terminate_build 0
%define multilib_64_archs sparc64 ppc64 s390x x86_64 %define multilib_64_archs sparc64 ppc64 s390x x86_64
%ifarch %{ix86} x86_64 ia64 %ifarch %{ix86} x86_64 ia64
@ -140,6 +140,7 @@ Patch31: gcc41-java-backport2.patch
Patch32: gcc41-java-libdotdotlib.patch Patch32: gcc41-java-libdotdotlib.patch
Patch33: gcc41-java-plugins.patch Patch33: gcc41-java-plugins.patch
Patch34: gcc41-java-backport-gcjplugin.patch Patch34: gcc41-java-backport-gcjplugin.patch
Patch35: gcc41-java-backport-class-loader.patch
%define _gnu %{nil} %define _gnu %{nil}
%ifarch sparc %ifarch sparc
@ -456,6 +457,7 @@ which are required to run programs compiled with the GNAT.
%patch32 -p0 -b .java-libdotdotlib~ %patch32 -p0 -b .java-libdotdotlib~
%patch33 -p0 -b .java-plugins~ %patch33 -p0 -b .java-plugins~
%patch34 -p0 -b .java-gcjplugin~ %patch34 -p0 -b .java-gcjplugin~
%patch35 -p0 -b .java-class-loader~
sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c sed -i -e 's/4\.1\.2/4.1.1/' gcc/BASE-VER gcc/version.c
sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c
@ -1518,8 +1520,12 @@ fi
%doc rpm.doc/changelogs/libmudflap/ChangeLog* %doc rpm.doc/changelogs/libmudflap/ChangeLog*
%changelog %changelog
* Tue Jul 25 2006 Alexandre Oliva <aoliva@redhat.com> 4.1.1-13
- Backport fix by Andrew Haley for build problems related with the
bootstrap ClassLoader.
* Mon Jul 24 2006 Alexandre Oliva <aoliva@redhat.com> 4.1.1-12 * Mon Jul 24 2006 Alexandre Oliva <aoliva@redhat.com> 4.1.1-12
- Backport fix for NullPointerException in GCJ web plugin. - Backport fix by Mark Wielaard for NullPointerException in GCJ web plugin.
* Fri Jul 21 2006 Jakub Jelinek <jakub@redhat.com> 4.1.1-11 * Fri Jul 21 2006 Jakub Jelinek <jakub@redhat.com> 4.1.1-11
- update from gcc-4_1-branch (-r115565:115644) - update from gcc-4_1-branch (-r115565:115644)