From 9b0bb5a4883c1e5002a8471fbefad60d3706f641 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 28 Jan 2003 15:39:35 +0000 Subject: 2003-01-28 Ralf Corsepius * gccnewlib.add: Add various BuildPreReq. Add %defattr(-,root,root) to "dir". * base-g77.add: %defattr(-,root,root). * base-gcc.add %defattr(-,root,root). * base-gcj.add %defattr(-,root,root). * base-gnat.add %defattr(-,root,root). * target-c++.add %defattr(-,root,root). * target-g77.add %defattr(-,root,root). * target-gcc.add %defattr(-,root,root). * target-gcj.add %defattr(-,root,root). * target-gnat.add %defattr(-,root,root). * target-objc.add %defattr(-,root,root). --- scripts/ChangeLog | 15 +++++++++++++++ scripts/gcc3newlib/base-g77.add | 1 + scripts/gcc3newlib/base-gcc.add | 1 + scripts/gcc3newlib/base-gcj.add | 1 + scripts/gcc3newlib/base-gnat.add | 1 + scripts/gcc3newlib/gccnewlib.add | 19 ++++++++++++++++++- scripts/gcc3newlib/target-c++.add | 1 + scripts/gcc3newlib/target-g77.add | 1 + scripts/gcc3newlib/target-gcc.add | 1 + scripts/gcc3newlib/target-gcj.add | 1 + scripts/gcc3newlib/target-gnat.add | 1 + scripts/gcc3newlib/target-objc.add | 1 + 12 files changed, 43 insertions(+), 1 deletion(-) diff --git a/scripts/ChangeLog b/scripts/ChangeLog index f34454c32c..0689b704e4 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,18 @@ +2003-01-28 Ralf Corsepius + + * gccnewlib.add: Add various BuildPreReq. + Add %defattr(-,root,root) to "dir". + * base-g77.add: %defattr(-,root,root). + * base-gcc.add %defattr(-,root,root). + * base-gcj.add %defattr(-,root,root). + * base-gnat.add %defattr(-,root,root). + * target-c++.add %defattr(-,root,root). + * target-g77.add %defattr(-,root,root). + * target-gcc.add %defattr(-,root,root). + * target-gcj.add %defattr(-,root,root). + * target-gnat.add %defattr(-,root,root). + * target-objc.add %defattr(-,root,root). + 2003-01-28 Ralf Corsepius * setup.def: binutils_rpm_release=2. diff --git a/scripts/gcc3newlib/base-g77.add b/scripts/gcc3newlib/base-g77.add index b1e2ba9f1f..b2495f4b2c 100644 --- a/scripts/gcc3newlib/base-g77.add +++ b/scripts/gcc3newlib/base-g77.add @@ -14,6 +14,7 @@ RTEMS is an open source operating system for embedded systems. This is the files for gcc/g77 that are shared by all targets. %files -n rtems-base-g77 +%defattr(-,root,root) %dir %{_prefix}/info %doc %{_prefix}/info/g77.info*.gz diff --git a/scripts/gcc3newlib/base-gcc.add b/scripts/gcc3newlib/base-gcc.add index 6c079d4da7..f719e8f5cc 100644 --- a/scripts/gcc3newlib/base-gcc.add +++ b/scripts/gcc3newlib/base-gcc.add @@ -13,6 +13,7 @@ RTEMS is an open source operating system for embedded systems. This is the files for gcc and newlib that are shared by all targets. %files -n rtems-base-gcc +%defattr(-,root,root) %dir %{_prefix}/info %doc %{_prefix}/info/cpp.info*.gz %doc %{_prefix}/info/cppinternals.info*.gz diff --git a/scripts/gcc3newlib/base-gcj.add b/scripts/gcc3newlib/base-gcj.add index 3c9b67a5bb..2362cadab1 100644 --- a/scripts/gcc3newlib/base-gcj.add +++ b/scripts/gcc3newlib/base-gcj.add @@ -14,6 +14,7 @@ RTEMS is an open source operating system for embedded systems. This is the files for gcc/java (gcj) that are shared by all targets. %files -n rtems-base-gcj +%defattr(-,root,root) %dir %{_prefix}/bin %{_prefix}/bin/jar@exe_ext@ %{_prefix}/bin/grepjar@exe_ext@ diff --git a/scripts/gcc3newlib/base-gnat.add b/scripts/gcc3newlib/base-gnat.add index 6dd961eef9..648e764c5e 100644 --- a/scripts/gcc3newlib/base-gnat.add +++ b/scripts/gcc3newlib/base-gnat.add @@ -13,6 +13,7 @@ RTEMS is an open source operating system for embedded systems. This is the gcc/gnat tools for the gcc/gnat compiler %files -n rtems-base-gnat +%defattr(-,root,root) %dir %{_prefix}/bin # %{_prefix}/bin/gnat* %endif diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add index 66214ae3be..b966956231 100644 --- a/scripts/gcc3newlib/gccnewlib.add +++ b/scripts/gcc3newlib/gccnewlib.add @@ -29,7 +29,8 @@ Source1: ftp://sources.redhat.com/pub/newlib/newlib-@newlib_version@.tar.gz @PATCH1@ @PATCH3@ Buildroot: %{_tmppath}/%{name} - +BuildPreReq: texinfo >= 4.2 +BuildPreReq: @target_alias@-binutils # # The original sources are not included in the source RPM. # If we included them, then the source RPMs for each target @@ -97,6 +98,21 @@ NoSource: 1 %define build_gcj 1 %endif +%if %build_gcj +# Building gcj requires bison and zlib +BuildPreReq: bison +%if "%_vendor" == "redhat" +BuildPreReq: zlib-devel +%endif +%endif + +%if %build_gnat +# Building gnat requires gnat +%if "%_vendor" == "redhat" +BuildPreReq: gcc-gnat +%endif +%endif + %description RTEMS is an open source operating system for embedded systems. @@ -243,6 +259,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null rm -f dirs ; + echo "%defattr(-,root,root)" >> dirs echo "%dir %{_prefix}/lib" >> dirs ; echo "%dir %{_prefix}/lib/gcc-lib" >> dirs ; echo "%dir %{_prefix}/lib/gcc-lib/@target_alias@" >> dirs ; diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add index b00a40ec14..e9e5ce9d52 100644 --- a/scripts/gcc3newlib/target-c++.add +++ b/scripts/gcc3newlib/target-c++.add @@ -14,6 +14,7 @@ RTEMS is an open source operating system for embedded systems. This is the gcc/g++ compiler for @target_alias@ %files -n @target_alias@-c++ -f build/files.g++ +%defattr(-,root,root) %doc %{_prefix}/man/man1/@target_alias@-g++.1* %dir %{_prefix}/bin diff --git a/scripts/gcc3newlib/target-g77.add b/scripts/gcc3newlib/target-g77.add index 01a897a18d..70957405c2 100644 --- a/scripts/gcc3newlib/target-g77.add +++ b/scripts/gcc3newlib/target-g77.add @@ -14,6 +14,7 @@ RTEMS is an open source operating system for embedded systems. This is the gcc/g77 compiler for @target_alias@ %files -n @target_alias@-g77 -f build/files.g77 +%defattr(-,root,root) %dir %{_prefix}/bin %{_prefix}/bin/@target_alias@-g77@exe_ext@ diff --git a/scripts/gcc3newlib/target-gcc.add b/scripts/gcc3newlib/target-gcc.add index 825eb7289f..cc4f248714 100644 --- a/scripts/gcc3newlib/target-gcc.add +++ b/scripts/gcc3newlib/target-gcc.add @@ -13,6 +13,7 @@ RTEMS is an open source operating system for embedded systems. This is gcc and newlib C Library for @target_alias@. %files -n @target_alias@-gcc -f build/files.gcc +%defattr(-,root,root) %doc %{_prefix}/man/man1/@target_alias@-gcc.1* %{_prefix}/bin/@target_alias@-cpp@exe_ext@ diff --git a/scripts/gcc3newlib/target-gcj.add b/scripts/gcc3newlib/target-gcj.add index 13aac54898..24abe938d0 100644 --- a/scripts/gcc3newlib/target-gcj.add +++ b/scripts/gcc3newlib/target-gcj.add @@ -14,6 +14,7 @@ RTEMS is an open source operating system for embedded systems. This is the gcc/java compiler for @target_alias@ %files -n @target_alias@-gcj -f build/files.gcj +%defattr(-,root,root) %dir %{_prefix}/bin %{_prefix}/bin/@target_alias@-gcj@exe_ext@ %{_prefix}/bin/@target_alias@-jcf-dump@exe_ext@ diff --git a/scripts/gcc3newlib/target-gnat.add b/scripts/gcc3newlib/target-gnat.add index 0aecd23159..3e2af9dc7b 100644 --- a/scripts/gcc3newlib/target-gnat.add +++ b/scripts/gcc3newlib/target-gnat.add @@ -14,6 +14,7 @@ RTEMS is an open source operating system for embedded systems. This is the gcc/gnat compiler for @target_alias@ %files -n @target_alias@-gnat +%defattr(-,root,root) # %files -n @target_alias@-gnat -f build/files.gnat %dir %{_prefix}/bin %{_prefix}/bin/@target_alias@-gnat* diff --git a/scripts/gcc3newlib/target-objc.add b/scripts/gcc3newlib/target-objc.add index 8bf6468d39..9e87c8bc14 100644 --- a/scripts/gcc3newlib/target-objc.add +++ b/scripts/gcc3newlib/target-objc.add @@ -14,6 +14,7 @@ RTEMS is an open source operating system for embedded systems. This is the gcc/objc compiler for @target_alias@ %files -n @target_alias@-objc -f build/files.objc +%defattr(-,root,root) %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@ %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc %endif -- cgit v1.2.3