Changeset 8e98cfb6 in rtems


Ignore:
Timestamp:
Nov 7, 2008, 3:24:02 AM (11 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.8
Children:
4fdab5d
Parents:
3568f50
Message:

Import changes from HEAD.

Location:
contrib/crossrpms/gcc
Files:
5 edited

Legend:

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

    r3568f50 r8e98cfb6  
    3333  CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \
    3434%else
    35   CC="%{__cc} ${RPM_OPT_FLAGS}" \
     35# gcc is not ready to be compiled with -std=gnu99
     36  CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
    3637%endif
    3738  ../gcc-%{gcc_pkgvers}/configure \
  • contrib/crossrpms/gcc/gccnewlib.add

    r3568f50 r8e98cfb6  
    3131BuildRequires:  %{_host_rpmprefix}mpfr-devel
    3232%endif
    33 %if "%{?fedora}" >= "8"
     33%if 0%{?fedora} >= 8
    3434BuildRequires:  mpfr-devel >= 2.3.0
    3535%endif
     
    5151%if %build_f95
    5252BuildRequires:  gmp-devel >= 4.1
    53 %if "%{?fedora}" >= "8"
     53%if 0%{?fedora} >= 8
    5454BuildRequires:  mpfr-devel >= 2.2.1
    5555%endif
  • contrib/crossrpms/gcc/prep.add

    r3568f50 r8e98cfb6  
    2626
    2727%if %build_objc
    28 %setup -T -D -n %{name}-%{version} -a5
     28%setup -q -T -D -n %{name}-%{version} -a5
    2929%{?PATCH5:%patch5 -p0}
    3030%endif
  • contrib/crossrpms/gcc/rpm-install.add

    r3568f50 r8e98cfb6  
    4848%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
    4949
     50
     51# Extract %%__debug_install_post into debug_install_post~
     52cat << \EOF > debug_install_post~
     53%__debug_install_post
     54EOF
     55
     56# Generate customized debug_install_post script
     57cat debug_install_post~ | while read a x y; do
     58case $a in
     59# Prevent find-debuginfo.sh* from trying to handle foreign binaries
     60*/find-debuginfo.sh)
     61  b=$(basename $a)
     62  sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b
     63  chmod a+x $b
     64  ;;
     65esac
     66done
     67
     68sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \
     69< debug_install_post~ > debug_install_post
     70%define __debug_install_post . ./debug_install_post
     71
     72
  • contrib/crossrpms/gcc/target-gcc.add

    r3568f50 r8e98cfb6  
    4545%endif
    4646
     47%if "%{gcc_version}" >= "4.3.0"
     48%dir %{gcclib}/@tool_target@/%{gcc_version}/include-fixed
     49%endif
     50
    4751%dir %{gccexec}
    4852%dir %{gccexec}/@tool_target@
Note: See TracChangeset for help on using the changeset viewer.