Changeset 6cd53b2 in rtems


Ignore:
Timestamp:
Feb 7, 2009, 9:26:19 AM (11 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.9
Children:
00ac31c4
Parents:
bdf53bd4
Message:

Sync with CVS-HEAD.

Location:
contrib/crossrpms
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/cpukit/build.add

    rbdf53bd4 r6cd53b2  
    66
    77  cd build
    8   ../rtems-%{cpukit_pkgvers}/configure \
     8  ../rtems-%{cpukit_version}/configure \
    99    --prefix=%{_prefix} \
    1010    --target=@tool_target@ \
  • contrib/crossrpms/cpukit/cpukit.add

    rbdf53bd4 r6cd53b2  
    22%define cpukit_pkgvers @CPUKIT_PKGVERS@
    33%define cpukit_version @CPUKIT_VERS@
    4 %define cpukit_rpmvers %{expand:%(echo "@CPUKIT_VERS@" | tr - _ )}
     4%define cpukit_rpmvers %{expand:%(echo "@CPUKIT_PKGVERS@" | tr - . )}
    55
    66Name:           @rpmprefix@@tool_target@-cpukit
     
    99Group:          Development/Tools
    1010Version:        %{cpukit_rpmvers}
    11 Release:        @CPUKIT_RPMREL@%{?dist}
     11Release:        @CPUKIT_RPMREL@
    1212License:        GPL
    1313URL:            http://cpukit.gnu.org
     
    1515BuildArch:      noarch
    1616
    17 %define _use_internal_dependency_generator 0
     17%define debug_package %{nil}
    1818
    1919BuildRequires:  @rpmprefix@@tool_target@-gcc
  • contrib/crossrpms/cpukit/rpm-install.add

    rbdf53bd4 r6cd53b2  
    3232
    3333
    34 cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
     34cat << EOF > %{_builddir}/%{name}-%{version}/find-provides
    3535#!/bin/sh
    3636grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
    3737  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__find_provides
    3838EOF
    39 chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
    40 %define __find_provides %{_builddir}/%{name}-%{cpukit_rpmvers}/find-provides
     39chmod +x %{_builddir}/%{name}-%{version}/find-provides
     40%define __find_provides %{_builddir}/%{name}-%{version}/find-provides
    4141
    42 cat << EOF > %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
     42cat << EOF > %{_builddir}/%{name}-%{version}/find-requires
    4343#!/bin/sh
    4444grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
    4545  | grep -v '^${RPM_BUILD_ROOT}%{cpukitlib}/@tool_target@/' | %__find_requires
    4646EOF
    47 chmod +x %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
    48 %define __find_requires %{_builddir}/%{name}-%{cpukit_rpmvers}/find-requires
     47chmod +x %{_builddir}/%{name}-%{version}/find-requires
     48%define __find_requires %{_builddir}/%{name}-%{version}/find-requires
    4949
  • contrib/crossrpms/cpukit/target-cpukit.add

    rbdf53bd4 r6cd53b2  
    11%description -n @rpmprefix@@tool_target@-cpukit
    2 GNU cc compiler for @tool_target@.
     2RTEMS cpukit for target @tool_target@.
    33
    44%files -n @rpmprefix@@tool_target@-cpukit
     5%defattr(-,root,root)
    56%sysdir %{_prefix}
    67%{_prefix}/@tool_target@
  • contrib/crossrpms/gcc/base-newlib.add

    rbdf53bd4 r6cd53b2  
    88Group:          Development/Tools
    99Version:        %{newlib_version}
     10Release:        @NEWLIB_RPMREL@
    1011License:        Distributable
    1112
  • contrib/crossrpms/gcc/gccnewlib.add

    rbdf53bd4 r6cd53b2  
    55
    66%if %build_newlib
     7%define newlib_pkgvers          @NEWLIB_PKGVERS@
    78%define newlib_version          @NEWLIB_VERS@
    8 %define gccnewlib_version       gcc%{gcc_version}newlib%{newlib_version}
    99%endif
    1010
     
    3939# These distros ship an insufficient mpfr
    4040%{?el4:%define  _build_mpfr     1}
    41 %{?suse10_2:%define     _build_mpfr     1}
    4241%{?suse10_3:%define     _build_mpfr     1}
    4342%endif
    4443
    4544%if "%{_build}" != "%{_host}"
    46 BuildRequires:  @rpmprefix@@tool_target@-gcc
     45BuildRequires:  @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}
    4746%endif
    4847
     
    7473Requires:       @rpmprefix@@tool_target@-w32api-sys-root
    7574%if %build_newlib
    76 Requires:       @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
     75Requires:       @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
    7776%endif
    7877
     
    8483# This really isn't available until RedHat 8.0.  How to conditionalize this?
    8584BuildRequires:  gcc-gnat
    86 BuildRequires:  @rpmprefix@@tool_target@-newlib < %{newlib_version}-%{release}
     85BuildRequires:  @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@
    8786%endif
    8887%if %build_f95
  • contrib/crossrpms/gcc/target-c++.add

    rbdf53bd4 r6cd53b2  
    1010
    1111%if "%{_build}" != "%{_host}"
    12 BuildRequires:  @rpmprefix@@tool_target@-gcc-c++
     12BuildRequires:  @rpmprefix@@tool_target@-gcc-c++ = %{gcc_rpmvers}
    1313%endif
    1414Provides:       @rpmprefix@@tool_target@-c++ = %{gcc_rpmvers}-%{release}
     
    3636
    3737%dir %{gcclib}/@tool_target@/%{gcc_version}/include
    38 %if "%{gcc_version}" >= "3.2"
    3938%{gcclib}/@tool_target@/%{gcc_version}/include/c++
    40 %else
    41 %{gcclib}/@tool_target@/%{gcc_version}/include/g++
    42 %endif
    4339%endif
    4440
  • contrib/crossrpms/gcc/target-gcc.add

    rbdf53bd4 r6cd53b2  
    77# Version:        %{gcc_rpmvers}
    88# Requires:       @rpmprefix@@tool_target@-binutils
    9 # Requires:       @rpmprefix@@tool_target@-newlib = %{newlib_version}-%{release}
     9# Requires:       @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@
    1010# License:      GPL
    1111
  • contrib/crossrpms/gcc/target-newlib.add

    rbdf53bd4 r6cd53b2  
    88License:        Distributable
    99Version:        %{newlib_version}
    10 
    11 Provides:       @rpmprefix@@tool_target@-libc = %{newlib_version}-%{release}
    12 Obsoletes:      @rpmprefix@@tool_target@-libc < %{newlib_version}-%{release}
     10Release:        @NEWLIB_RPMREL@
    1311
    1412%if %build_infos
Note: See TracChangeset for help on using the changeset viewer.