Changeset f81476f in rtems


Ignore:
Timestamp:
Jul 23, 2007, 2:02:15 AM (13 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
131ee1cc
Parents:
86a30d0
Message:

Sync GCC with testing.

Location:
contrib/crossrpms/rtems4.8/m68k
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/rtems4.8/m68k/Makefile.am

    r86a30d0 rf81476f  
    1111BINUTILS_OPTS +=
    1212
    13 GCC_VERS = 4.2.0
     13GCC_VERS = 4.2.1
    1414GCC_PKGVERS = $(GCC_VERS)
    15 GCC_RPMREL = 18
     15GCC_RPMREL = 20
    1616NEWLIB_VERS = 1.15.0
    1717include ../gcc.am
    18 # ATM, we don't want infos from bleeding edge GCC
    19 GCC_OPTS += --disable-infos
    2018GCC_OPTS += --languages=cxx
    2119
  • contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gcc.spec

    r86a30d0 rf81476f  
    1515
    1616
    17 %define gcc_pkgvers 4.2.0
    18 %define gcc_version 4.2.0
    19 %define gcc_rpmvers %{expand:%(echo "4.2.0" | tr - _ )}
     17%define gcc_pkgvers 4.2.1
     18%define gcc_version 4.2.1
     19%define gcc_rpmvers %{expand:%(echo "4.2.1" | tr - _ )}
    2020
    2121%define newlib_version          1.15.0
     
    2727Group:          Development/Tools
    2828Version:        %{gcc_rpmvers}
    29 Release:        18%{?dist}
     29Release:        20%{?dist}
    3030License:        GPL
    3131URL:            http://gcc.gnu.org
     
    4141BuildRequires:  rtems-4.8-m68k-rtems4.8-binutils
    4242
     43Requires:       rtems-4.8-gcc-common
    4344Requires:       rtems-4.8-m68k-rtems4.8-binutils
    4445Requires:       rtems-4.8-m68k-rtems4.8-newlib = %{newlib_version}-%{release}
     
    6869Source0:        ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    6970Patch0:         gcc-core-%{gcc_pkgvers}-rtems4.8-20070613.diff
     71%endif
     72%if "%{gcc_version}" == "4.2.1"
     73Source0:        ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
     74Patch0:         gcc-core-4.2.1-rtems4.8-20070719.diff
    7075%endif
    7176%{?_without_sources:NoSource:   0}
     
    157162
    158163  make all
     164  make info
    159165  cd ..
    160166
     
    187193
    188194
    189 # Conflict with a native GCC's infos
    190   rm -rf $RPM_BUILD_ROOT%{_infodir}
    191 
    192 # Conflict with a native GCC's man pages
    193   rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
     195  # We don't ship info/dir
     196  rm -f $RPM_BUILD_ROOT%{_infodir}/dir
     197  touch $RPM_BUILD_ROOT%{_infodir}/dir
    194198
    195199
     
    372376%dir %{gcclib}/m68k-rtems4.8/%{gcc_version}/include
    373377%if "%{gcc_version}" > "4.0.3"
    374 %if "m68k-rtems4.8" != "bfin-rtems4.7"
     378%if "m68k-rtems4.8" != "bfin-rtems4.8"
    375379%dir %{gcclib}/m68k-rtems4.8/%{gcc_version}/include/ssp
    376380%endif
     
    384388
    385389# ==============================================================
     390# rtems-4.8-gcc-common
     391# ==============================================================
     392%package -n rtems-4.8-gcc-common
     393Summary:        Base package for rtems gcc and newlib C Library
     394Group:          Development/Tools
     395Version:        %{gcc_rpmvers}
     396License:        GPL
     397
     398Requires(post):         /sbin/install-info
     399Requires(preun):        /sbin/install-info
     400
     401%description -n rtems-4.8-gcc-common
     402
     403GCC files that are shared by all targets.
     404
     405%files -n rtems-4.8-gcc-common
     406%defattr(-,root,root)
     407%dir %{_infodir}
     408%ghost %{_infodir}/dir
     409%{_infodir}/cpp.info*
     410%{_infodir}/cppinternals.info*
     411%{_infodir}/gcc.info*
     412%{_infodir}/gccint.info*
     413%if "%{gcc_version}" >= "3.4"
     414%{_infodir}/gccinstall.info*
     415%endif
     416
     417%dir %{_mandir}
     418%if "%{gcc_version}" < "3.4"
     419%dir %{_mandir}/man1
     420%{_mandir}/man1/cpp.1*
     421%{_mandir}/man1/gcov.1*
     422%endif
     423%dir %{_mandir}/man7
     424%{_mandir}/man7/fsf-funding.7*
     425%{_mandir}/man7/gfdl.7*
     426%{_mandir}/man7/gpl.7*
     427
     428%post -n rtems-4.8-gcc-common
     429  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
     430  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
     431  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
     432  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
     433%if "%{gcc_version}" >= "3.4"
     434  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
     435%endif
     436
     437%preun -n rtems-4.8-gcc-common
     438if [ $1 -eq 0 ]; then
     439  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
     440  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
     441  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
     442  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
     443%if "%{gcc_version}" >= "3.4"
     444  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
     445%endif
     446fi
     447
     448# ==============================================================
    386449# rtems-4.8-m68k-rtems4.8-gcc-c++
    387450# ==============================================================
     
    395458Obsoletes:      rtems-4.8-m68k-rtems4.8-c++ < %{gcc_rpmvers}-%{release}
    396459
     460Requires:       rtems-4.8-gcc-common
    397461Requires:       rtems-4.8-m68k-rtems4.8-gcc = %{gcc_rpmvers}-%{release}
    398462
     
    433497Obsoletes:      rtems-4.8-m68k-rtems4.8-libc < %{newlib_version}-%{release}
    434498
     499Requires:       rtems-4.8-newlib-common
    435500
    436501%description -n rtems-4.8-m68k-rtems4.8-newlib
     
    443508%{_exec_prefix}/m68k-rtems4.8/include
    444509
     510# ==============================================================
     511# rtems-4.8-newlib-common
     512# ==============================================================
     513%package -n rtems-4.8-newlib-common
     514Summary:        Base package for RTEMS newlib C Library
     515Group:          Development/Tools
     516Version:        %{newlib_version}
     517License:        Distributable
     518
     519Requires(post):         /sbin/install-info
     520Requires(preun):        /sbin/install-info
     521
     522%description -n rtems-4.8-newlib-common
     523newlib files that are shared by all targets.
     524
     525%files -n rtems-4.8-newlib-common
     526%defattr(-,root,root)
     527%dir %{_infodir}
     528%ghost %{_infodir}/dir
     529%{_infodir}/libc.info*
     530%{_infodir}/libm.info*
     531
     532%post -n rtems-4.8-newlib-common
     533  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
     534  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
     535
     536%preun -n rtems-4.8-newlib-common
     537if [ $1 -eq 0 ]; then
     538  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
     539  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
     540fi
     541
Note: See TracChangeset for help on using the changeset viewer.