diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-04 14:39:05 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-04 14:39:05 +0000 |
commit | cdf5ff651ba24d2e81ee6bcd9e3aa3659d6dd2c3 (patch) | |
tree | f9a6c59f4822530759b25df3d8037ee73eeb9f6c /scripts/gcc3newlib | |
parent | 2003-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-cdf5ff651ba24d2e81ee6bcd9e3aa3659d6dd2c3.tar.bz2 |
2003-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* binutils/base-binutils.add: Add osversion support.
* binutils/binutils.add: Add osversion support.
%setup -n %{name}-%{version}.
Don't remove c++filt.
* binutils/target-binutils.add: Add osversion support.
Pickup c++filt.
* gcc3newlib/base-g77.add: Add osversion support.
* gcc3newlib/base-gcc.add: Add osversion support.
* gcc3newlib/base-gcj.add: Add osversion support.
* gcc3newlib/base-gnat.add: Add osversion support.
* gcc3newlib/gccnewlib.add: Add osversion support.
Remove c++filt,
%setup -n -n %{name}-%{version}.
* gcc3newlib/target-c++.add: Add osversion support.
Don't pickup c++filt.
* gcc3newlib/target-g77.add: Add osversion support.
* gcc3newlib/target-gcc.add: Add osversion support.
* gcc3newlib/target-gcj.add: Add osversion support.
* gcc3newlib/target-gnat.add: Add osversion support.
* gccnewlib/gccnewlib.add: %setup -n %{name}-%{version}.
* gdb/base-gdb.add: Add osversion support, rpmgroup, rpmprefix,
gdb_version, gdb_target.
* gdb/target-gdb.add: Ditto.
* gdb/gdb.add: Ditto.
%setup -n -n %{name}-%{version}.
Diffstat (limited to 'scripts/gcc3newlib')
-rw-r--r-- | scripts/gcc3newlib/base-g77.add | 10 | ||||
-rw-r--r-- | scripts/gcc3newlib/base-gcc.add | 12 | ||||
-rw-r--r-- | scripts/gcc3newlib/base-gcj.add | 8 | ||||
-rw-r--r-- | scripts/gcc3newlib/base-gnat.add | 6 | ||||
-rw-r--r-- | scripts/gcc3newlib/gccnewlib.add | 40 | ||||
-rw-r--r-- | scripts/gcc3newlib/target-c++.add | 3 | ||||
-rw-r--r-- | scripts/gcc3newlib/target-g77.add | 2 | ||||
-rw-r--r-- | scripts/gcc3newlib/target-gcc.add | 2 | ||||
-rw-r--r-- | scripts/gcc3newlib/target-gcj.add | 2 | ||||
-rw-r--r-- | scripts/gcc3newlib/target-gnat.add | 2 |
10 files changed, 40 insertions, 47 deletions
diff --git a/scripts/gcc3newlib/base-g77.add b/scripts/gcc3newlib/base-g77.add index 06f96e8e61..1500007930 100644 --- a/scripts/gcc3newlib/base-g77.add +++ b/scripts/gcc3newlib/base-g77.add @@ -2,17 +2,17 @@ # ============================================================== # rtems-base-g77 # ============================================================== -%package -n %{rpmprefix}rtems-base-g77 +%package -n %{rpmprefix}rtems@osversion@-base-g77 Summary: rtems base package for gcc/g77 compiler Group: %{rpmgroup} Requires: rtems-base-gcc -%description -n %{rpmprefix}rtems-base-g77 +%description -n %{rpmprefix}rtems@osversion@-base-g77 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 %{rpmprefix}rtems-base-g77 +%files -n %{rpmprefix}rtems@osversion@-base-g77 %defattr(-,root,root) %dir %{_prefix}/info %doc %{_prefix}/info/g77.info*.gz @@ -21,7 +21,7 @@ This is the files for gcc/g77 that are shared by all targets. %dir %{_prefix}/man/man1 %doc %{_prefix}/man/man1/%{gcc_target}-g77.1* -%post -n %{rpmprefix}rtems-base-g77 +%post -n %{rpmprefix}rtems@osversion@-base-g77 if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; then rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir @@ -31,7 +31,7 @@ This is the files for gcc/g77 that are shared by all targets. done fi -%postun -n %{rpmprefix}rtems-base-g77 +%postun -n %{rpmprefix}rtems@osversion@-base-g77 if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; then rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir diff --git a/scripts/gcc3newlib/base-gcc.add b/scripts/gcc3newlib/base-gcc.add index f628b8d50c..27d0288929 100644 --- a/scripts/gcc3newlib/base-gcc.add +++ b/scripts/gcc3newlib/base-gcc.add @@ -1,17 +1,17 @@ # ============================================================== -# %{rpmprefix}rtems-base-gcc +# %{rpmprefix}rtems@osversion@-base-gcc # ============================================================== -%package -n %{rpmprefix}rtems-base-gcc +%package -n %{rpmprefix}rtems@osversion@-base-gcc Summary: base package for rtems gcc and newlib C Library Group: %{rpmgroup} -%description -n %{rpmprefix}rtems-base-gcc +%description -n %{rpmprefix}rtems@osversion@-base-gcc 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 %{rpmprefix}rtems-base-gcc +%files -n %{rpmprefix}rtems@osversion@-base-gcc %defattr(-,root,root) %dir %{_prefix}/info %doc %{_prefix}/info/cpp.info*.gz @@ -32,7 +32,7 @@ This is the files for gcc and newlib that are shared by all targets. %dir %{_prefix}/include -%post -n %{rpmprefix}rtems-base-gcc +%post -n %{rpmprefix}rtems@osversion@-base-gcc if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; then rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir @@ -42,7 +42,7 @@ This is the files for gcc and newlib that are shared by all targets. done fi -%postun -n %{rpmprefix}rtems-base-gcc +%postun -n %{rpmprefix}rtems@osversion@-base-gcc if test -d $RPM_INSTALL_PREFIX%{_prefix}/info; then rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir diff --git a/scripts/gcc3newlib/base-gcj.add b/scripts/gcc3newlib/base-gcj.add index 93d4f9f25d..7fdb6c18d1 100644 --- a/scripts/gcc3newlib/base-gcj.add +++ b/scripts/gcc3newlib/base-gcj.add @@ -2,17 +2,17 @@ # ============================================================== # rtems-base-gcj # ============================================================== -%package -n %{rpmprefix}rtems-base-gcj +%package -n %{rpmprefix}rtems@osversion@-base-gcj Summary: base package for rtems gcc/java compiler (gcj). Group: %{rpmgroup} -Requires: %{rpmprefix}rtems-base-gcc +Requires: %{rpmprefix}rtems@osversion@-base-gcc -%description -n %{rpmprefix}rtems-base-gcj +%description -n %{rpmprefix}rtems@osversion@-base-gcj 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 %{rpmprefix}rtems-base-gcj +%files -n %{rpmprefix}rtems@osversion@-base-gcj %defattr(-,root,root) %dir %{_prefix}/bin %{_prefix}/bin/jar%{_exeext} diff --git a/scripts/gcc3newlib/base-gnat.add b/scripts/gcc3newlib/base-gnat.add index 451994596a..090d187615 100644 --- a/scripts/gcc3newlib/base-gnat.add +++ b/scripts/gcc3newlib/base-gnat.add @@ -2,16 +2,16 @@ # ============================================================== # rtems-base-gnat # ============================================================== -%package -n %{rpmprefix}rtems-base-gnat +%package -n %{rpmprefix}rtems@osversion@-base-gnat Summary: gcc/gnat tools Group: %{rpmgroup} -%description -n %{rpmprefix}rtems-base-gnat +%description -n %{rpmprefix}rtems@osversion@-base-gnat RTEMS is an open source operating system for embedded systems. This is the gcc/gnat tools for the gcc/gnat compiler -%files -n %{rpmprefix}rtems-base-gnat +%files -n %{rpmprefix}rtems@osversion@-base-gnat %defattr(-,root,root) %dir %{_prefix}/bin # %{_prefix}/bin/gnat* diff --git a/scripts/gcc3newlib/gccnewlib.add b/scripts/gcc3newlib/gccnewlib.add index 66a77139ba..098953708d 100644 --- a/scripts/gcc3newlib/gccnewlib.add +++ b/scripts/gcc3newlib/gccnewlib.add @@ -71,38 +71,38 @@ NoSource: 1 %define build_gcj 0 %define build_gnat 0 -%if "%{gcc_target}" == "arm-rtems" +%if "%{gcc_target}" == "arm-rtems@osversion@" %define build_gcj %_gcj %endif -%if "%{gcc_target}" == "c4x-rtems" +%if "%{gcc_target}" == "c4x-rtems@osversion@" %define build_cxx 0 %endif -%if "%{gcc_target}" == "i386-rtems" +%if "%{gcc_target}" == "i386-rtems@osversion@" %define build_gnat %_gnat %define build_gcj %_gcj %endif -%if "%{gcc_target}" == "i960-rtems" +%if "%{gcc_target}" == "i960-rtems@osversion@" %define build_cxx 0 %endif -%if "%{gcc_target}" == "m68k-rtems" +%if "%{gcc_target}" == "m68k-rtems@osversion@" %define build_gcj %_gcj %endif -%if "%{gcc_target}" == "mips-rtems" +%if "%{gcc_target}" == "mips-rtems@osversion@" %define build_gnat %_gnat %define build_gcj %_gcj %endif -%if "%{gcc_target}" == "powerpc-rtems" +%if "%{gcc_target}" == "powerpc-rtems@osversion@" %define build_gnat %_gnat %define build_gcj %_gcj %endif -%if "%{gcc_target}" == "sparc-rtems" +%if "%{gcc_target}" == "sparc-rtems@osversion@" %define build_gnat %_gnat %define build_gcj %_gcj %endif @@ -140,7 +140,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. %prep # untar the sources inside %{gcc_target}-gcc-newlib -%setup -c -T -n %{name} -a0 -a1 +%setup -c -T -n %{name}-%{version} -a0 -a1 @PATCH2@ @PATCH4@ @@ -199,11 +199,7 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. cp ../gcc-%{gcc_version}/gcc/gsyslimits.h gcc/include/syslimits.h %endif -%if %build_cxx -%if "%{gcc_version}" >= "3.3" - make -C %{gcc_target}/libiberty CFLAGS="$RPM_OPT_FLAGS" c++filt -%endif -%endif + rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext} %if %build_gnat cd ../gcc-%{gcc_version}/gcc/ada @@ -230,11 +226,12 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/../newlib-%{newlib_version}/newlib/libc/include" # Without this xgcc doesn't find the target's binutils. GNATLIBCFLAGS="$GNATLIBCFLAGS -B%{_prefix}/%{gcc_target}/bin/" -%if "%{gcc_target}" == "mips-rtems" +%if "%{gcc_target}" == "mips-rtems@osversion@" GNATLIBCFLAGS="$GNATLIBCFLAGS -G0" %endif make -C gcc GNATLIBCFLAGS="${GNATLIBCFLAGS}" gnatlib %endif + make info %install @@ -268,6 +265,11 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. # host library rm -f ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a +%if "%{gcc_version}" < "3.3" + # We use the version from binutils + rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext} +%endif + %if "%{gcc_version}" < "3.0" # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets. # Rename it to target_alias-cpp @@ -278,14 +280,6 @@ This is gcc's and newlib C Library's sources with patches for RTEMS. fi %endif -%if %build_cxx -%if "%{gcc_version}" >= "3.3" - install -d $RPM_BUILD_ROOT%{_prefix}/bin - install -c -m 755 %{gcc_target}/libiberty/c++filt%{_exeext} \ - $RPM_BUILD_ROOT%{_prefix}/bin/%{target_alias}-c++filt%{_exeext} -%endif -%endif - # gzip info files gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null %if "%{gcc_version}" < "3.3" diff --git a/scripts/gcc3newlib/target-c++.add b/scripts/gcc3newlib/target-c++.add index e2fe80a86b..e96f876f42 100644 --- a/scripts/gcc3newlib/target-c++.add +++ b/scripts/gcc3newlib/target-c++.add @@ -5,7 +5,7 @@ %package -n %{rpmprefix}%{gcc_target}-c++ Summary: gcc/g++ compiler (c++) for %{gcc_target} Group: %{rpmgroup} -Requires: %{rpmprefix}rtems-base-gcc %{rpmprefix}%{gcc_target}-gcc +Requires: %{rpmprefix}rtems@osversion@-base-gcc %{rpmprefix}%{gcc_target}-gcc %description -n %{rpmprefix}%{gcc_target}-c++ RTEMS is an open source operating system for embedded systems. @@ -19,7 +19,6 @@ This is the gcc/g++ compiler for %{gcc_target} %dir %{_prefix}/bin %{_prefix}/bin/%{gcc_target}-c++%{_exeext} %{_prefix}/bin/%{gcc_target}-g++%{_exeext} -%{_prefix}/bin/%{gcc_target}-c++filt%{_exeext} %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/cc1plus%{_exeext} %dir %{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/include diff --git a/scripts/gcc3newlib/target-g77.add b/scripts/gcc3newlib/target-g77.add index 0e2b696855..bbf5c07fbd 100644 --- a/scripts/gcc3newlib/target-g77.add +++ b/scripts/gcc3newlib/target-g77.add @@ -5,7 +5,7 @@ %package -n %{rpmprefix}%{gcc_target}-g77 Summary: gcc/g77 compiler for %{gcc_target} Group: %{rpmgroup} -Requires: %{rpmprefix}rtems-base-g77 %{rpmprefix}%{gcc_target}-gcc +Requires: %{rpmprefix}rtems@osversion@-base-g77 %{rpmprefix}%{gcc_target}-gcc %description -n %{rpmprefix}%{gcc_target}-g77 RTEMS is an open source operating system for embedded systems. diff --git a/scripts/gcc3newlib/target-gcc.add b/scripts/gcc3newlib/target-gcc.add index 161d902524..b2f48ff091 100644 --- a/scripts/gcc3newlib/target-gcc.add +++ b/scripts/gcc3newlib/target-gcc.add @@ -4,7 +4,7 @@ %package -n %{rpmprefix}%{gcc_target}-gcc Summary: rtems gcc and newlib C Library for %{gcc_target} Group: %{rpmgroup} -Requires: %{rpmprefix}%{gcc_target}-binutils %{rpmprefix}rtems-base-gcc +Requires: %{rpmprefix}%{gcc_target}-binutils %{rpmprefix}rtems@osversion@-base-gcc %description -n %{rpmprefix}%{gcc_target}-gcc RTEMS is an open source operating system for embedded systems. diff --git a/scripts/gcc3newlib/target-gcj.add b/scripts/gcc3newlib/target-gcj.add index d1a5e6b9c2..1f32281e6f 100644 --- a/scripts/gcc3newlib/target-gcj.add +++ b/scripts/gcc3newlib/target-gcj.add @@ -5,7 +5,7 @@ %package -n %{rpmprefix}%{gcc_target}-gcj Summary: gcc/java compiler (gcj) for %{gcc_target} Group: %{rpmgroup} -Requires: %{rpmprefix}rtems-base-gcj %{rpmprefix}%{gcc_target}-gcc +Requires: %{rpmprefix}rtems@osversion@-base-gcj %{rpmprefix}%{gcc_target}-gcc %description -n %{rpmprefix}%{gcc_target}-gcj RTEMS is an open source operating system for embedded systems. diff --git a/scripts/gcc3newlib/target-gnat.add b/scripts/gcc3newlib/target-gnat.add index 6e9d1166a0..ccd1670b09 100644 --- a/scripts/gcc3newlib/target-gnat.add +++ b/scripts/gcc3newlib/target-gnat.add @@ -5,7 +5,7 @@ %package -n %{rpmprefix}%{gcc_target}-gnat Summary: gcc/gnat compiler for %{gcc_target} Group: %{rpmgroup} -Requires: %{rpmprefix}rtems-base-gnat %{rpmprefix}%{gcc_target}-gcc +Requires: %{rpmprefix}rtems@osversion@-base-gnat %{rpmprefix}%{gcc_target}-gcc %description -n %{rpmprefix}%{gcc_target}-gnat RTEMS is an open source operating system for embedded systems. |