Changeset 4fec4975 in rtems


Ignore:
Timestamp:
Jun 3, 2007, 3:26:45 PM (13 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
967c8974
Parents:
0ae15e60
Message:

GCC_RPMREL = 17.

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

Legend:

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

    r0ae15e60 r4fec4975  
    1111BINUTILS_OPTS +=
    1212
    13 GCC_VERS = 4.1.2
     13GCC_VERS = 4.2.0
    1414GCC_PKGVERS = $(GCC_VERS)
    15 GCC_RPMREL = 11
     15GCC_RPMREL = 17
    1616NEWLIB_VERS = 1.15.0
    1717include ../gcc.am
     18# ATM, we don't want infos from bleeding edge GCC
     19GCC_OPTS += --disable-infos
    1820GCC_OPTS += --languages=cxx
    1921
  • contrib/crossrpms/rtems4.8/m68k/gcc-sources.add

    r0ae15e60 r4fec4975  
    1 Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
    21%if "%{gcc_version}" == "4.0.3"
     2Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
    33Patch0:         gcc-core-4.0.3-rtems-20060822.diff
    44%endif
    55%if "%{gcc_version}" == "4.1.1"
     6Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
    67Patch0:         gcc-core-4.1.1-rtems4.8-20070201.diff
    78%endif
    89%if "%{gcc_version}" == "4.1.2"
     10Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
    911Patch0:         gcc-core-4.1.2-rtems4.8-20070216.diff
     12%endif
     13%if "%{gcc_version}" == "4.2.0"
     14Source0:        ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
     15Patch0:         gcc-core-%{gcc_pkgvers}-rtems4.8-20070515.diff
    1016%endif
    1117%{?_without_sources:NoSource:   0}
  • contrib/crossrpms/rtems4.8/m68k/rtems-4.8-m68k-rtems4.8-gcc.spec

    r0ae15e60 r4fec4975  
    1515
    1616
    17 %define gcc_pkgvers 4.1.2
    18 %define gcc_version 4.1.2
    19 %define gcc_rpmvers %{expand:%(echo "4.1.2" | tr - _ )}
     17%define gcc_pkgvers 4.2.0
     18%define gcc_version 4.2.0
     19%define gcc_rpmvers %{expand:%(echo "4.2.0" | tr - _ )}
    2020
    2121%define newlib_version          1.15.0
     
    2727Group:          Development/Tools
    2828Version:        %{gcc_rpmvers}
    29 Release:        11%{?dist}
     29Release:        17%{?dist}
    3030License:        GPL
    3131URL:            http://gcc.gnu.org
     
    4141BuildRequires:  rtems-4.8-m68k-rtems4.8-binutils
    4242
    43 Requires:       rtems-4.8-gcc-common
    4443Requires:       rtems-4.8-m68k-rtems4.8-binutils
    4544Requires:       rtems-4.8-m68k-rtems4.8-newlib = %{newlib_version}-%{release}
     
    5453%endif
    5554
    56 Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
    5755%if "%{gcc_version}" == "4.0.3"
     56Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
    5857Patch0:         gcc-core-4.0.3-rtems-20060822.diff
    5958%endif
    6059%if "%{gcc_version}" == "4.1.1"
     60Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
    6161Patch0:         gcc-core-4.1.1-rtems4.8-20070201.diff
    6262%endif
    6363%if "%{gcc_version}" == "4.1.2"
     64Source0:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_pkgvers}.tar.bz2
    6465Patch0:         gcc-core-4.1.2-rtems4.8-20070216.diff
     66%endif
     67%if "%{gcc_version}" == "4.2.0"
     68Source0:        ftp://gcc.gnu.org/pub/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
     69Patch0:         gcc-core-%{gcc_pkgvers}-rtems4.8-20070515.diff
    6570%endif
    6671%{?_without_sources:NoSource:   0}
     
    151156
    152157  make all
    153   make info
    154158  cd ..
    155159
     
    182186
    183187
    184   # We don't ship info/dir
    185   rm -f $RPM_BUILD_ROOT%{_infodir}/dir
    186   touch $RPM_BUILD_ROOT%{_infodir}/dir
     188# Conflict with a native GCC's infos
     189  rm -rf $RPM_BUILD_ROOT%{_infodir}
     190
     191# Conflict with a native GCC's man pages
     192  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
    187193
    188194
     
    377383
    378384# ==============================================================
    379 # rtems-4.8-rtems4.7-base-gcc
    380 # ==============================================================
    381 %package -n rtems-4.8-gcc-common
    382 Summary:        Base package for rtems gcc and newlib C Library
    383 Group:          Development/Tools
    384 Version:        %{gcc_rpmvers}
    385 License:        GPL
    386 
    387 Requires(post):         /sbin/install-info
    388 Requires(preun):        /sbin/install-info
    389 
    390 Provides:       rtems-4.8-rtems4.7-base-gcc = %{gcc_version}-%{release}
    391 Obsoletes:      rtems-4.8-rtems4.7-base-gcc < %{gcc_rpmvers}-%{release}
    392 Provides:       rtems-4.8-rtems-base-gcc = %{gcc_version}-%{release}
    393 Obsoletes:      rtems-4.8-rtems-base-gcc < %{gcc_rpmvers}-%{release}
    394 
    395 %description -n rtems-4.8-gcc-common
    396 
    397 GCC files that are shared by all targets.
    398 
    399 %files -n rtems-4.8-gcc-common
    400 %defattr(-,root,root)
    401 %dir %{_infodir}
    402 %ghost %{_infodir}/dir
    403 %{_infodir}/cpp.info*
    404 %{_infodir}/cppinternals.info*
    405 %{_infodir}/gcc.info*
    406 %{_infodir}/gccint.info*
    407 %if "%{gcc_version}" >= "3.4"
    408 %{_infodir}/gccinstall.info*
    409 %endif
    410 
    411 %dir %{_mandir}
    412 %if "%{gcc_version}" < "3.4"
    413 %dir %{_mandir}/man1
    414 %{_mandir}/man1/cpp.1*
    415 %{_mandir}/man1/gcov.1*
    416 %endif
    417 %dir %{_mandir}/man7
    418 %{_mandir}/man7/fsf-funding.7*
    419 %{_mandir}/man7/gfdl.7*
    420 %{_mandir}/man7/gpl.7*
    421 
    422 %post -n rtems-4.8-gcc-common
    423   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
    424   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
    425   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    426   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    427 %if "%{gcc_version}" >= "3.4"
    428   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    429 %endif
    430 
    431 %preun -n rtems-4.8-gcc-common
    432 if [ $1 -eq 0 ]; then
    433   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
    434   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || :
    435   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    436   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    437 %if "%{gcc_version}" >= "3.4"
    438   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    439 %endif
    440 fi
    441 
    442 # ==============================================================
    443385# rtems-4.8-m68k-rtems4.8-gcc-c++
    444386# ==============================================================
     
    452394Obsoletes:      rtems-4.8-m68k-rtems4.8-c++ < %{gcc_rpmvers}-%{release}
    453395
    454 Requires:       rtems-4.8-gcc-common
    455396Requires:       rtems-4.8-m68k-rtems4.8-gcc = %{gcc_rpmvers}-%{release}
    456397
     
    491432Obsoletes:      rtems-4.8-m68k-rtems4.8-libc < %{newlib_version}-%{release}
    492433
    493 Requires:       rtems-4.8-newlib-common
    494434
    495435%description -n rtems-4.8-m68k-rtems4.8-newlib
     
    502442%{_exec_prefix}/m68k-rtems4.8/include
    503443
    504 # ==============================================================
    505 # rtems-4.8-newlib-common
    506 # ==============================================================
    507 %package -n rtems-4.8-newlib-common
    508 Summary:        Base package for RTEMS newlib C Library
    509 Group:          Development/Tools
    510 Version:        %{newlib_version}
    511 License:        Distributable
    512 
    513 Provides:       rtems-4.8-rtems4.7-base-newlib = %{newlib_version}-%{release}
    514 Obsoletes:      rtems-4.8-rtems4.7-base-newlib < %{newlib_version}-%{release}
    515 Provides:       rtems-4.8-rtems-base-newlib = %{newlib_version}-%{release}
    516 Obsoletes:      rtems-4.8-rtems-base-newlib < %{newlib_version}-%{release}
    517 
    518 Provides:       rtems-4.8-rtems4.7-base-libc = %{newlib_version}-%{release}
    519 Obsoletes:      rtems-4.8-rtems4.7-base-libc < %{newlib_version}-%{release}
    520 Provides:       rtems-4.8-rtems-base-libc = %{newlib_version}-%{release}
    521 Obsoletes:      rtems-4.8-rtems-base-libc < %{newlib_version}-%{release}
    522 
    523 
    524 Requires(post):         /sbin/install-info
    525 Requires(preun):        /sbin/install-info
    526 
    527 %description -n rtems-4.8-newlib-common
    528 newlib files that are shared by all targets.
    529 
    530 %files -n rtems-4.8-newlib-common
    531 %defattr(-,root,root)
    532 %dir %{_infodir}
    533 %ghost %{_infodir}/dir
    534 %{_infodir}/libc.info*
    535 %{_infodir}/libm.info*
    536 
    537 %post -n rtems-4.8-newlib-common
    538   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
    539   /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
    540 
    541 %preun -n rtems-4.8-newlib-common
    542 if [ $1 -eq 0 ]; then
    543   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || :
    544   /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || :
    545 fi
    546 
Note: See TracChangeset for help on using the changeset viewer.