linking fixed

[packages/gcc.git] / gcc.spec

diff --git a/gcc.spec b/gcc.spec
index 25abe744fdcec979d750ef2ae498a0dadcc35153..70002091b511f6678e3be2d163ca8e6dc4e8bdae 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,14 +1,15 @@
 %define                STDC_VERSION 2.10.0
+%define                ver 2.95.3
 Summary:       GNU Compiler Collection
 Summary(pl):   Kolekcja kompilatorów GNU
 Name:          gcc
-Version:       2.95.3
-Release:       14
+Version:       %{ver}
+Release:       17
 License:       GPL
 Group:         Development/Languages
 Group(de):     Entwicklung/Sprachen
 Group(pl):     Programowanie/Jêzyki
-Source0:       ftp://ftp.gnu.org/pub/gnu/gcc/%{name}-2.95.2.tar.gz
+Source0:       ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{version}-prerelease/%{name}-%{version}.test1.tar.gz
 Source1:       gcov.1
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-pld-linux.patch
@@ -16,35 +17,34 @@ Patch2:             %{name}-libstdc++.patch
 Patch3:                %{name}-bootstrap.patch
 Patch4:                %{name}-cpp-macro-doc.patch
 Patch5:                %{name}-default-arch.patch
-Patch6:                %{name}-cvs-updates-20000220.patch.gz
+Patch6:                %{name}-cvs-updates-20000826.patch.gz
 Patch7:                %{name}-libstdc++-out-of-mem.patch
 Patch8:                %{name}-libstdc++-wstring.patch
 Patch9:                %{name}-libstdc++-wall3.patch
 Patch10:       %{name}-libstdc++-bastring.patch
 Patch11:       %{name}-manpage.patch
 Patch12:       %{name}-cpp-dos-newlines.patch
-Patch13:       %{name}-g++-is-tree.patch
-Patch14:       %{name}-gpc.patch
-Patch15:       %{name}-arm-config.patch
-Patch16:       %{name}-m68k-pic.patch
-Patch17:       %{name}-sparc32-rfi.patch
-Patch18:       %{name}-builtin-apply.patch
-Patch19:       %{name}-gcj-backport.patch
-Patch20:       %{name}-ppc-ice.patch
-Patch21:       %{name}-ppc-descriptions.patch
-Patch22:       %{name}-ppc-andrew-dwarf-eh.patch
-
-Patch23:       %{name}-alpha-complex-float.patch
-Patch24:       %{name}-emit-rtl.patch
-Patch25:       %{name}-empty-struct-init.patch
-Patch26:       %{name}-gcj-vs-iconv.patch
-Patch27:       %{name}-libobjc.patch
-Patch28:       %{name}-pointer-arith.patch
-
-Patch29:       %{name}-glibc-2.2.patch
-Patch30:       %{name}-O2-bug.patch
+Patch13:       %{name}-gpc.patch
+Patch14:       %{name}-arm-config.patch
+Patch15:       %{name}-m68k-pic.patch
+Patch16:       %{name}-sparc32-rfi.patch
+Patch17:       %{name}-builtin-apply.patch
+Patch18:       %{name}-gcj-backport.patch
+Patch19:       %{name}-ppc-ice.patch
+Patch20:       %{name}-ppc-descriptions.patch
+Patch21:       %{name}-ppc-andrew-dwarf-eh.patch
+
+Patch22:       %{name}-alpha-complex-float.patch
+Patch23:       %{name}-emit-rtl.patch
+Patch24:       %{name}-gcj-vs-iconv.patch
+Patch25:       %{name}-libobjc.patch
+Patch26:       %{name}-pointer-arith.patch
+
+Patch27:       %{name}-glibc-2.2.patch
+Patch28:       %{name}-O2-bug.patch
 
 BuildRequires: bison
+BuildRequires: texinfo
 Requires:      binutils >= 2.9.1.0.25
 Requires:      cpp = %{version}
 URL:           http://gcc.gnu.org/
@@ -313,57 +313,55 @@ Preprocesor C umo
   odpowiada fragment pliku wynikowego.
 
 %prep
-%setup -q -n %{name}-2.95.2
+%setup -q -n %{name}-%{ver}.test1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p0
 %patch5 -p0
-%patch6 -p1
+#%patch6 -p1
 %patch7 -p0
 %patch8 -p0
-%patch9 -p0
+#%patch9 -p0
 %patch10 -p0
 %patch11 -p0
 %patch12 -p0
 %patch13 -p1
-%patch14 -p1
-%ifarch arm
-%patch15 -p0
-%endif
+#%ifarch arm
+#%patch14 -p0
+#%endif
 %ifarch m68k
-%patch16 -p0
+%patch15 -p0
 %endif
 %ifarch sparc sparc32
+%patch16 -p0
 %patch17 -p0
-%patch18 -p0
-%patch19 -p1
+%patch18 -p1
 %endif
 %ifarch ppc
+%patch19 -p0
 %patch20 -p0
-%patch21 -p0
-%patch22 -p0
+#%patch21 -p0
 %endif
 %ifarch alpha
-%patch23 -p1
+%patch22 -p1
 %endif
+#%patch23 -p0
 %patch24 -p0
 %patch25 -p0
 %patch26 -p0
-%patch27 -p0
-%patch28 -p0
-%patch29 -p1
-%patch30 -p1
+#%patch27 -p1
+#%patch28 -p1
 
 %build
 (cd gcc; autoconf)
 rm -rf obj-%{_target_platform}
 install -d obj-%{_target_platform} && cd obj-%{_target_platform} 
 
-CFLAGS="%{!?debug:$RPM_OPT_FLAGS}%{?debug:-O -g}"
-CXXFLAGS="%{!?debug:$RPM_OPT_FLAGS}%{?debug:-O -g}" 
-../configure \
+CFLAGS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}" \
+CXXFLAGS="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}" \
+TEXCONFIG=false ../configure \
        --prefix=%{_prefix} \
        --infodir=%{_infodir} \
        --enable-shared \
@@ -374,12 +372,14 @@ CXXFLAGS="%{!?debug:$RPM_OPT_FLAGS}%{?debug:-O -g}"
        --with-gnu-as \
        --with-gnu-ld \
        --with-gxx-include-dir="\$\{prefix\}/include/g++" \
+       --disable-nls \
        %{_target_platform}
 
 PATH=$PATH:/sbin:%{_sbindir}
 touch  ../gcc/c-gperf.h
 
-%{__make} bootstrap \
+cd ..
+%{__make} -C obj-%{_target_platform} bootstrap \
        LDFLAGS_FOR_TARGET="%{!?debug:-s}" \
        mandir=%{_mandir} \
        infodir=%{_infodir}
@@ -408,12 +408,8 @@ echo .so cccp.1 > $RPM_BUILD_ROOT%{_mandir}/man1/cpp.1
 install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 ln -sf g77 $RPM_BUILD_ROOT%{_bindir}/f77
-
-(cd $RPM_BUILD_ROOT%{_libdir} ; ln -sf libstdc++.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libstdc++.so)
-
-install -d $RPM_BUILD_ROOT/lib
-(cd $RPM_BUILD_ROOT; \
-ln -sf ../`dirname usr/lib/gcc-lib/%{_target_cpu}*/*/cpp`/cpp $RPM_BUILD_ROOT/lib/cpp)
+(cd $RPM_BUILD_ROOT%{_libdir} ; ln -sf libstdc++.so.*.*.* $RPM_BUILD_ROOT%{_libdir}/libstdc++.so))
+ln -sf %{_bindir}/cpp $RPM_BUILD_ROOT%{_libdir}/cpp
 
 gzip -9nf ../READ* ../ChangeLog ../gcc/ch/chill.brochure
 
@@ -567,10 +563,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n cpp
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/cpp
+%attr(755,root,root) %{_bindir}/cpp
+%attr(755,root,root) %{_libdir}/cpp
+%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cpp0
 
 %{_mandir}/man1/cpp.1*
 %{_mandir}/man1/cccp.1*
 %{_infodir}/cpp.info*.gz
-
-%attr(755,root,root) %{_libdir}/gcc-lib/%{_target_cpu}*/*/cpp