|
|
@@ -1,9 +1,7 @@
|
|
|
-%global DATE 20130920
|
|
|
-%global SVNREV 202765
|
|
|
%global gcc_version 4.8.1
|
|
|
# Note, gcc_release must be integer, if you want to add suffixes to
|
|
|
# %{release}, append them after %{gcc_release} on Release: line.
|
|
|
-%global gcc_release 1%{?_dist_release}
|
|
|
+%global gcc_release 2%{?_dist_release}
|
|
|
%global _unpackaged_files_terminate_build 0
|
|
|
%global multilib_64_archs sparc64 ppc64 s390x x86_64
|
|
|
# %ifarch %{ix86} x86_64 ia64 ppc ppc64 alpha
|
|
|
@@ -74,12 +72,7 @@ Release: %{gcc_release}
|
|
|
# GCC Runtime Exception.
|
|
|
License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
|
|
|
Group: Development/Languages
|
|
|
-# The source for this package was pulled from upstream's vcs. Use the
|
|
|
-# following commands to generate the tarball:
|
|
|
-# svn export svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_7-branch@%{SVNREV} gcc-%{version}-%{DATE}
|
|
|
-# tar cf - gcc-%{version}-%{DATE} | bzip2 -9 > gcc-%{version}-%{DATE}.tar.bz2
|
|
|
-Source0: gcc-%{version}-%{DATE}.tar.bz2
|
|
|
-#Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
|
|
|
+Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}/%{name}-%{version}.tar.bz2
|
|
|
%global fastjar_ver 0.97
|
|
|
Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
|
|
|
URL: http://gcc.gnu.org
|
|
|
@@ -202,7 +195,6 @@ Patch11: gcc48-libstdc++-docs.patch
|
|
|
Patch12: gcc48-no-add-needed.patch
|
|
|
Patch13: gcc48-pr56564.patch
|
|
|
Patch14: gcc48-pr56493.patch
|
|
|
-Patch15: gcc48-color-auto.patch
|
|
|
|
|
|
Patch1000: fastjar-0.97-segfault.patch
|
|
|
Patch1001: fastjar-0.97-len1.patch
|
|
|
@@ -950,7 +942,7 @@ not stable, so plugins must be rebuilt any time GCC is updated.
|
|
|
#####################################################################
|
|
|
|
|
|
%prep
|
|
|
-%setup -q -n gcc-%{version}-%{DATE}
|
|
|
+%setup -q
|
|
|
%patch0 -p0 -b .hack~
|
|
|
%patch1 -p0 -b .java-nomulti~
|
|
|
%patch2 -p0 -b .ppc32-retaddr~
|
|
|
@@ -970,7 +962,6 @@ not stable, so plugins must be rebuilt any time GCC is updated.
|
|
|
%patch12 -p0 -b .no-add-needed~
|
|
|
%patch13 -p0 -b .pr56564~
|
|
|
%patch14 -p0 -b .pr56493~
|
|
|
-%patch15 -p0 -b .color-auto~
|
|
|
|
|
|
# This testcase doesn't compile.
|
|
|
rm libjava/testsuite/libjava.lang/PR35020*
|
|
|
@@ -987,8 +978,6 @@ tar xzf %{SOURCE4}
|
|
|
tar xjf %{SOURCE10}
|
|
|
%endif
|
|
|
|
|
|
-sed -i -e 's/4\.8\.2/4.8.1/' gcc/BASE-VER
|
|
|
-
|
|
|
%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
|
|
|
# Default to -gdwarf-4 -fno-debug-types-section rather than -gdwarf-2
|
|
|
sed -i '/UInteger Var(dwarf_version)/s/Init(2)/Init(4)/' gcc/common.opt
|
|
|
@@ -1503,7 +1492,7 @@ ln -sf ../../../libgomp.so.1.* libgomp.so
|
|
|
ln -sf ../../../libmudflap.so.0.* libmudflap.so
|
|
|
ln -sf ../../../libmudflapth.so.0.* libmudflapth.so
|
|
|
%if %{build_go}
|
|
|
-ln -sf ../../../libgo.so.4.* libgo.so
|
|
|
+ln -sf ../../../libgo.so.3.* libgo.so
|
|
|
%endif
|
|
|
%if %{build_libquadmath}
|
|
|
ln -sf ../../../libquadmath.so.0.* libquadmath.so
|
|
|
@@ -1531,7 +1520,7 @@ ln -sf ../../../../%{_lib}/libgomp.so.1.* libgomp.so
|
|
|
ln -sf ../../../../%{_lib}/libmudflap.so.0.* libmudflap.so
|
|
|
ln -sf ../../../../%{_lib}/libmudflapth.so.0.* libmudflapth.so
|
|
|
%if %{build_go}
|
|
|
-ln -sf ../../../../%{_lib}/libgo.so.4.* libgo.so
|
|
|
+ln -sf ../../../../%{_lib}/libgo.so.3.* libgo.so
|
|
|
%endif
|
|
|
%if %{build_libquadmath}
|
|
|
ln -sf ../../../../%{_lib}/libquadmath.so.0.* libquadmath.so
|
|
|
@@ -1658,8 +1647,8 @@ echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libmudflap.so.0.* | sed 's
|
|
|
echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > 64/libmudflapth.so
|
|
|
%if %{build_go}
|
|
|
rm -f libgo.so
|
|
|
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.4.* | sed 's,^.*libg,libg,'`' )' > libgo.so
|
|
|
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.4.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so
|
|
|
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib/libgo.so.3.* | sed 's,^.*libg,libg,'`' )' > libgo.so
|
|
|
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib/libgo.so.3.* | sed 's,^.*libg,libg,'`' )' > 64/libgo.so
|
|
|
%endif
|
|
|
%if %{build_libquadmath}
|
|
|
rm -f libquadmath.so
|
|
|
@@ -1743,8 +1732,8 @@ echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libmudflap.so.0.* | sed 's
|
|
|
echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libmudflapth.so.0.* | sed 's,^.*libm,libm,'`' )' > 32/libmudflapth.so
|
|
|
%if %{build_go}
|
|
|
rm -f libgo.so
|
|
|
-echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.4.* | sed 's,^.*libg,libg,'`' )' > libgo.so
|
|
|
-echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.4.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so
|
|
|
+echo 'INPUT ( %{_prefix}/lib64/'`echo ../../../../lib64/libgo.so.3.* | sed 's,^.*libg,libg,'`' )' > libgo.so
|
|
|
+echo 'INPUT ( %{_prefix}/lib/'`echo ../../../../lib64/libgo.so.3.* | sed 's,^.*libg,libg,'`' )' > 32/libgo.so
|
|
|
%endif
|
|
|
%if %{build_libquadmath}
|
|
|
rm -f libquadmath.so
|
|
|
@@ -1845,7 +1834,7 @@ chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libasan.so.0.*
|
|
|
chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libtsan.so.0.*
|
|
|
%endif
|
|
|
%if %{build_go}
|
|
|
-chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgo.so.4.*
|
|
|
+chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libgo.so.3.*
|
|
|
%endif
|
|
|
chmod 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libobjc.so.4.*
|
|
|
|
|
|
@@ -2686,12 +2675,13 @@ fi
|
|
|
%{_prefix}/%{_lib}/libgcj-tools.so.*
|
|
|
%{_prefix}/%{_lib}/libgcj_bc.so.*
|
|
|
%{_prefix}/%{_lib}/libgij.so.*
|
|
|
-%dir %{_prefix}/%{_lib}/gcj-%{version}
|
|
|
-%{_prefix}/%{_lib}/gcj-%{version}/libgtkpeer.so
|
|
|
-%{_prefix}/%{_lib}/gcj-%{version}/libgjsmalsa.so
|
|
|
-%{_prefix}/%{_lib}/gcj-%{version}/libjawt.so
|
|
|
-%{_prefix}/%{_lib}/gcj-%{version}/libjvm.so
|
|
|
-%{_prefix}/%{_lib}/gcj-%{version}/libjavamath.so
|
|
|
+%dir %{_prefix}/%{_lib}/gcj-%{version}-14
|
|
|
+%{_prefix}/%{_lib}/gcj-%{version}-14/classmap.db
|
|
|
+%{_prefix}/%{_lib}/gcj-%{version}-14/libgtkpeer.so
|
|
|
+%{_prefix}/%{_lib}/gcj-%{version}-14/libgjsmalsa.so
|
|
|
+%{_prefix}/%{_lib}/gcj-%{version}-14/libjawt.so
|
|
|
+%{_prefix}/%{_lib}/gcj-%{version}-14/libjvm.so
|
|
|
+%{_prefix}/%{_lib}/gcj-%{version}-14/libjavamath.so
|
|
|
%dir %{_prefix}/share/java
|
|
|
%{_prefix}/share/java/[^sl]*
|
|
|
%{_prefix}/share/java/libgcj-%{version}.jar
|
|
|
@@ -3068,9 +3058,9 @@ fi
|
|
|
|
|
|
%files -n libgo
|
|
|
%defattr(-,root,root,-)
|
|
|
-%{_prefix}/%{_lib}/libgo.so.4*
|
|
|
+%{_prefix}/%{_lib}/libgo.so.3*
|
|
|
%ifarch %{multilib_64_archs}
|
|
|
-%{_prefix}/lib/libgo.so.4*
|
|
|
+%{_prefix}/lib/libgo.so.3*
|
|
|
%endif
|
|
|
%doc rpm.doc/libgo/*
|
|
|
|
|
|
@@ -3128,6 +3118,9 @@ fi
|
|
|
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Sep 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.1-2
|
|
|
+- change source (original)
|
|
|
+
|
|
|
* Sun Sep 29 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.8.1-1
|
|
|
- updated to 4.8.1
|
|
|
- merged with FC 4.8.1-10.fc21
|
Takemikaduchi