diff options
Diffstat (limited to 'scripts/gcc3newlib/gccnewlib.add')
-rw-r--r-- | scripts/gcc3newlib/gccnewlib.add | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add index 26b341d174..fcd17f063f 100644 --- a/scripts/gcc3newlib/gccnewlib.add +++ b/scripts/gcc3newlib/gccnewlib.add @@ -195,12 +195,14 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. export PATH="%{_bindir}:${PATH}" ../gcc-%{gcc_version}/configure \ + --prefix=%{_prefix} --mandir=%{_mandir} \ + --infodir=%{_infodir} \ --build=%_build --host=%_host \ --target=%{gcc_target} \ --with-gnu-as --with-gnu-ld --with-newlib --verbose \ --with-system-zlib --disable-nls \ --enable-version-specific-runtime-libs \ - --enable-threads=rtems --prefix=%{_prefix} \ + --enable-threads=rtems \ --enable-languages=$languages ${libgcj_flag} %if "%_host" != "%_build" @@ -264,10 +266,16 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. %endif make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} install + bindir=$RPM_BUILD_ROOT%{_bindir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ + infodir=$RPM_BUILD_ROOT%{_infodir} \ + install cd %{gcc_target}/newlib make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} install-info + bindir=$RPM_BUILD_ROOT%{_bindir} \ + mandir=$RPM_BUILD_ROOT%{_mandir} \ + infodir=$RPM_BUILD_ROOT%{_infodir} \ + install-info # cd back to build/ cd ../.. @@ -288,15 +296,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext} # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir + rm -f $RPM_BUILD_ROOT%{_infodir}/dir %if "%{gcc_version}" >= "3.4" # Bug in gcc-3.4.0pre rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-%{gcc_target}-gcjh%{_exeext} -%if "%{gcc_version}" < "3.4.1" - # Broken in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_infodir}/gccinstall.* -%endif %endif %if "%{gcc_version}" >= "3.3" @@ -316,13 +320,16 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. %endif # gzip info files - gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null -%if "%{gcc_version}" < "3.3" + gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info 2>/dev/null +%if "%{gcc_version}" < "3.3" || "%{gcc_version}" >= "3.4" # gcc-3.3 ships monolytic *.infos - gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null - gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null + gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info-? 2>/dev/null + gzip -9qf $RPM_BUILD_ROOT%{_infodir}/*.info-?? 2>/dev/null %endif + # gzip man pages + gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/*.? 2>/dev/null + rm -f dirs ; echo "%defattr(-,root,root)" >> dirs echo "%dir %{_prefix}/lib" >> dirs ; @@ -367,6 +374,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. *f771) ;; *cc1) ;; *cc1obj) ;; + *cc1plus) ;; # ignore: explicitly put into rpm elsewhere *collect2) ;; *libobjc*) echo "$i" >> files.objc ;; *include/objc*) ;; @@ -377,7 +385,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. *gnat1);; *jc1) ;; *jvgenmain) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere *libstdc++.a) echo "$i" >> files.g++ ;; *libsupc++.a) echo "$i" >> files.g++ ;; *) echo "$i" >> files.gcc ;; |