Changeset 9af225c in rtems


Ignore:
Timestamp:
Aug 27, 2009, 2:22:20 AM (10 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, master
Children:
1bd552a
Parents:
150fd4c
Message:

s,%{gcclib},%{_gcclibdir}/gcc/,

Location:
contrib/crossrpms/gcc
Files:
7 edited

Legend:

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

    r150fd4c r9af225c  
    2020  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    2121    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    22       $RPM_BUILD_ROOT%{gcclib}/@tool_target@/%{gcc_version}/include/
     22      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/
    2323  fi
    2424%endif
    2525
    2626  # host library
    27   rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     27  rm -f  ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
    2828
    2929  # We use the version from binutils
     
    5252%endif
    5353
    54 %if "%{gcc_version}" >= "3.4"
    5554  # Bug in gcc-3.4.0pre
    5655  rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-@tool_target@-gcjh%{_exeext}
    57 %endif
    5856
    59 %if "%{gcc_version}" >= "3.3"
    6057  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    6158  # the fixinclude-install-tools
    62   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/%{gcc_version}/install-tools
     59  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools
    6360  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/install-tools
    64 %endif
    6561
    6662  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    9288  echo "%dir %{_libexecdir}" >> dirs
    9389%endif
    94   echo "%dir %{gcclib}" >> dirs
    95   echo "%dir %{gcclib}/@tool_target@" >> dirs
     90  echo "%dir %{_gcclibdir}/gcc" >> dirs
     91  echo "%dir %{_gcclibdir}/gcc/@tool_target@" >> dirs
    9692
    97   TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}"
     93  TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
    9894  for i in $f; do
    9995    case $i in
     
    112108  cp dirs build/files.g++
    113109
    114   TGTDIR="%{gcclib}/@tool_target@/%{gcc_version}"
     110  TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}"
    115111  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    116112  for i in $f; do
  • contrib/crossrpms/gcc/rpm-install.add

    r150fd4c r9af225c  
    3535#!/bin/sh
    3636grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
    37   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_provides
     37  | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_provides
    3838EOF
    3939chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    4343#!/bin/sh
    4444grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \
    45   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/@tool_target@/' | %__find_requires
     45  | grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/' | %__find_requires
    4646EOF
    4747chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
  • contrib/crossrpms/gcc/target-c++.add

    r150fd4c r9af225c  
    3535%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1plus%{_exeext}
    3636
    37 %dir %{gcclib}/@tool_target@/%{gcc_version}/include
    38 %{gcclib}/@tool_target@/%{gcc_version}/include/c++
     37%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
     38%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++
    3939%endif
    4040
  • contrib/crossrpms/gcc/target-gcc.add

    r150fd4c r9af225c  
    3636%{_bindir}/@tool_target@-gccbug
    3737
    38 %dir %{gcclib}/@tool_target@/%{gcc_version}/include
     38%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include
    3939%if "%{gcc_version}" > "4.0.3"
    4040%if "@tool_target@" != "bfin-rtems@rtems_api@"
    4141%if "@tool_target@" != "avr-rtems@rtems_api@"
    42 %dir %{gcclib}/@tool_target@/%{gcc_version}/include/ssp
     42%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ssp
    4343%endif
    4444%endif
     
    4646
    4747%if "%{gcc_version}" >= "4.3.0"
    48 %dir %{gcclib}/@tool_target@/%{gcc_version}/include-fixed
     48%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed
    4949%endif
    5050
  • contrib/crossrpms/gcc/target-gfortran.add

    r150fd4c r9af225c  
    3232%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/f951%{_exeext}
    3333
    34 %{gcclib}/@tool_target@/%{gcc_version}/finclude
     34%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/finclude
    3535%endif
    3636
  • contrib/crossrpms/gcc/target-gnat.add

    r150fd4c r9af225c  
    3030%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/gnat1%{_exeext}
    3131
    32 %{gcclib}/@tool_target@/%{gcc_version}/adalib
    33 %{gcclib}/@tool_target@/%{gcc_version}/adainclude
     32%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib
     33%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude
    3434%endif
    3535
  • contrib/crossrpms/gcc/target-objc.add

    r150fd4c r9af225c  
    2424%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1obj%{_exeext}
    2525
    26 %{gcclib}/@tool_target@/%{gcc_version}/include/objc
     26%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc
    2727%endif
    2828
Note: See TracChangeset for help on using the changeset viewer.