Changeset cdc1b12 in rtems


Ignore:
Timestamp:
Aug 27, 2009, 3:47:52 PM (10 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, master
Children:
8ff9bb8
Parents:
a2acf4f0
Message:

Regenerate.

Location:
contrib/crossrpms/rtems4.10
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • contrib/crossrpms/rtems4.10/arm/rtems-4.10-arm-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-arm-rtems4.10-binutils
    136 Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/arm-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.10-arm-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/arm-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/arm-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/arm-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/arm-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/arm-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/arm-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-arm-rtems4.10-binutils
    477 # Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-arm-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/arm-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/arm-rtems4.10-cpp.1*
    494482%{_mandir}/man1/arm-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/arm-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/arm-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/arm-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/arm-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/arm-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "arm-rtems4.10" != "bfin-rtems4.10"
    509494%if "arm-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/arm-rtems4.10
    521 %dir %{gccexec}/arm-rtems4.10/%{gcc_version}
    522 %{gccexec}/arm-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/arm-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/arm-rtems4.10
     506%dir %{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/arm-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/arm-rtems4.10
    613 %dir %{gccexec}/arm-rtems4.10/%{gcc_version}
    614 %{gccexec}/arm-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/arm-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/arm-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/arm-rtems4.10
     587%dir %{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/arm-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/arm-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/avr/rtems-4.10-avr-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        5%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-avr-rtems4.10-binutils
    136 Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-45%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
     138Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
    146142
    147143%if "%{gcc_version}" == "4.4.1"
     
    222218    --exec_prefix=%{_exec_prefix} \
    223219    --includedir=%{_includedir} \
    224     --libdir=%{_libdir} \
     220    --libdir=%{_gcclibdir} \
    225221    --libexecdir=%{_libexecdir} \
    226222    --mandir=%{_mandir} \
     
    268264  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    269265    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    270       $RPM_BUILD_ROOT%{gcclib}/avr-rtems4.10/%{gcc_version}/include/
     266      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include/
    271267  fi
    272268%endif
    273269
    274270  # host library
     271%if "%{gcc_version}" >= "4.2.0"
     272  # libiberty doesn't honor --libdir, but always installs to a
     273  # magically guessed _libdir
    275274  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     275%else
     276  # libiberty installs to --libdir=...
     277  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     278%endif
    276279
    277280  # We use the version from binutils
     
    283286  touch $RPM_BUILD_ROOT%{_infodir}/dir
    284287
    285 
    286 %if "%{gcc_version}" >= "3.4"
    287288  # Bug in gcc-3.4.0pre
    288289  rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.10-avr-rtems4.10-gcjh%{_exeext}
    289 %endif
    290 
    291 %if "%{gcc_version}" >= "3.3"
     290
    292291  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    293292  # the fixinclude-install-tools
    294   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.10/%{gcc_version}/install-tools
    295   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/avr-rtems4.10/%{gcc_version}/install-tools
    296 %endif
     293  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/install-tools
     294  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/install-tools
    297295
    298296  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    319317  echo "%dir %{_prefix}" >> dirs
    320318  echo "%dir %{_libdir}" >> dirs
    321 %if "%{gcc_version}" >= "3.4"
    322319  echo "%dir %{_libexecdir}" >> dirs
    323 %endif
    324   echo "%dir %{gcclib}" >> dirs
    325   echo "%dir %{gcclib}/avr-rtems4.10" >> dirs
    326 
    327   TGTDIR="%{gcclib}/avr-rtems4.10/%{gcc_version}"
     320  echo "%dir %{_gcclibdir}/gcc" >> dirs
     321  echo "%dir %{_gcclibdir}/gcc/avr-rtems4.10" >> dirs
     322
     323  TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}"
    328324  for i in $f; do
    329325    case $i in
     
    337333  # Collect files to go into different packages
    338334  cp dirs build/files.gcc
    339   cp dirs build/files.g77
    340335  cp dirs build/files.gfortran
    341336  cp dirs build/files.objc
     
    343338  cp dirs build/files.g++
    344339
    345   TGTDIR="%{gcclib}/avr-rtems4.10/%{gcc_version}"
     340  TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}"
    346341  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    347342  for i in $f; do
     
    358353    *include/g++*);;
    359354    *include/c++*);;
     355    *finclude/*);;
    360356    *adainclude*);;
    361357    *adalib*);;
     
    412408#!/bin/sh
    413409grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.10/(lib|include|sys-root)' \
    414   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.10/' | %__find_provides
     410  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.10/'} | %__find_provides
    415411EOF
    416412chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    420416#!/bin/sh
    421417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.10/(lib|include|sys-root)' \
    422   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/avr-rtems4.10/' | %__find_requires
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.10/'} | %__find_requires
    423419EOF
    424420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    460456# Version:        %{gcc_rpmvers}
    461457# Requires:       rtems-4.10-avr-rtems4.10-binutils
    462 # Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-45%{?dist}
     458# Requires:       rtems-4.10-avr-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    463459# License:      GPL
    464460
     
    475471%dir %{_mandir}/man1
    476472%{_mandir}/man1/avr-rtems4.10-gcc.1*
    477 %if "%{gcc_version}" >= "3.4"
    478473%{_mandir}/man1/avr-rtems4.10-cpp.1*
    479474%{_mandir}/man1/avr-rtems4.10-gcov.1*
    480 %endif
    481475
    482476%dir %{_bindir}
    483477%{_bindir}/avr-rtems4.10-cpp%{_exeext}
    484478%{_bindir}/avr-rtems4.10-gcc%{_exeext}
    485 %if "%{gcc_version}" >= "3.3"
    486479%{_bindir}/avr-rtems4.10-gcc-%{gcc_version}%{_exeext}
    487 %endif
    488480%{_bindir}/avr-rtems4.10-gcov%{_exeext}
    489481%{_bindir}/avr-rtems4.10-gccbug
    490482
    491 %dir %{gcclib}/avr-rtems4.10/%{gcc_version}/include
     483%dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include
    492484%if "%{gcc_version}" > "4.0.3"
    493485%if "avr-rtems4.10" != "bfin-rtems4.10"
    494486%if "avr-rtems4.10" != "avr-rtems4.10"
    495 %dir %{gcclib}/avr-rtems4.10/%{gcc_version}/include/ssp
     487%dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include/ssp
    496488%endif
    497489%endif
     
    499491
    500492%if "%{gcc_version}" >= "4.3.0"
    501 %dir %{gcclib}/avr-rtems4.10/%{gcc_version}/include-fixed
    502 %endif
    503 
    504 %dir %{gccexec}
    505 %dir %{gccexec}/avr-rtems4.10
    506 %dir %{gccexec}/avr-rtems4.10/%{gcc_version}
    507 %{gccexec}/avr-rtems4.10/%{gcc_version}/cc1%{_exeext}
    508 %{gccexec}/avr-rtems4.10/%{gcc_version}/collect2%{_exeext}
     493%dir %{_gcclibdir}/gcc/avr-rtems4.10/%{gcc_version}/include-fixed
     494%endif
     495
     496%dir %{_libexecdir}/gcc
     497%dir %{_libexecdir}/gcc/avr-rtems4.10
     498%dir %{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}
     499%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/cc1%{_exeext}
     500%{_libexecdir}/gcc/avr-rtems4.10/%{gcc_version}/collect2%{_exeext}
    509501
    510502# ==============================================================
     
    531523%{_infodir}/gcc.info*
    532524%{_infodir}/gccint.info*
    533 %if "%{gcc_version}" >= "3.4"
    534525%{_infodir}/gccinstall.info*
    535 %endif
    536526
    537527%dir %{_mandir}
    538 %if "%{gcc_version}" < "3.4"
    539 %dir %{_mandir}/man1
    540 %{_mandir}/man1/cpp.1*
    541 %{_mandir}/man1/gcov.1*
    542 %endif
    543528%dir %{_mandir}/man7
    544529%{_mandir}/man7/fsf-funding.7*
     
    551536  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    552537  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    553 %if "%{gcc_version}" >= "3.4"
    554538  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    555 %endif
    556539
    557540%preun -n rtems-4.10-gcc-common
     
    561544  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    562545  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    563 %if "%{gcc_version}" >= "3.4"
    564546  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    565 %endif
    566547fi
    567548
     
    577558License:        Distributable
    578559Version:        %{newlib_version}
    579 Release:        45%{?dist}
     560Release:        46%{?dist}
    580561
    581562Requires:       rtems-4.10-newlib-common
     
    597578Group:          Development/Tools
    598579Version:        %{newlib_version}
    599 Release:        45%{?dist}
     580Release:        46%{?dist}
    600581License:        Distributable
    601582
  • contrib/crossrpms/rtems4.10/bfin/rtems-4.10-bfin-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-bfin-rtems4.10-binutils
    136 Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/bfin-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.10-bfin-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/bfin-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/bfin-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/bfin-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/bfin-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/bfin-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/bfin-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-bfin-rtems4.10-binutils
    477 # Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-bfin-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/bfin-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/bfin-rtems4.10-cpp.1*
    494482%{_mandir}/man1/bfin-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/bfin-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/bfin-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/bfin-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/bfin-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/bfin-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "bfin-rtems4.10" != "bfin-rtems4.10"
    509494%if "bfin-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/bfin-rtems4.10
    521 %dir %{gccexec}/bfin-rtems4.10/%{gcc_version}
    522 %{gccexec}/bfin-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/bfin-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/bfin-rtems4.10
     506%dir %{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/bfin-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/bfin-rtems4.10
    613 %dir %{gccexec}/bfin-rtems4.10/%{gcc_version}
    614 %{gccexec}/bfin-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/bfin-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/bfin-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/bfin-rtems4.10
     587%dir %{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/bfin-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/bfin-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/h8300/rtems-4.10-h8300-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-h8300-rtems4.10-binutils
    136 Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/h8300-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.10-h8300-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/h8300-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/h8300-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/h8300-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/h8300-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/h8300-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/h8300-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-h8300-rtems4.10-binutils
    477 # Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-h8300-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/h8300-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/h8300-rtems4.10-cpp.1*
    494482%{_mandir}/man1/h8300-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/h8300-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/h8300-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/h8300-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/h8300-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/h8300-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "h8300-rtems4.10" != "bfin-rtems4.10"
    509494%if "h8300-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/h8300-rtems4.10
    521 %dir %{gccexec}/h8300-rtems4.10/%{gcc_version}
    522 %{gccexec}/h8300-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/h8300-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/h8300-rtems4.10
     506%dir %{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/h8300-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/h8300-rtems4.10
    613 %dir %{gccexec}/h8300-rtems4.10/%{gcc_version}
    614 %{gccexec}/h8300-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/h8300-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/h8300-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/h8300-rtems4.10
     587%dir %{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/h8300-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/h8300-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/i386/rtems-4.10-i386-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-i386-rtems4.10-binutils
    136 Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/i386-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.10-i386-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/i386-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/i386-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/i386-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/i386-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/i386-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/i386-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-i386-rtems4.10-binutils
    477 # Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-i386-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/i386-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/i386-rtems4.10-cpp.1*
    494482%{_mandir}/man1/i386-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/i386-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/i386-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/i386-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/i386-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/i386-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "i386-rtems4.10" != "bfin-rtems4.10"
    509494%if "i386-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/i386-rtems4.10
    521 %dir %{gccexec}/i386-rtems4.10/%{gcc_version}
    522 %{gccexec}/i386-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/i386-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/i386-rtems4.10
     506%dir %{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/i386-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/i386-rtems4.10
    613 %dir %{gccexec}/i386-rtems4.10/%{gcc_version}
    614 %{gccexec}/i386-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/i386-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/i386-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/i386-rtems4.10
     587%dir %{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/i386-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/i386-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/lm32/rtems-4.10-lm32-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-lm32-rtems4.10-binutils
    136 Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/lm32-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/lm32-rtems4.10-lm32-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/lm32-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/lm32-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/lm32-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/lm32-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/lm32-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/lm32-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/lm32-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/lm32-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/lm32-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/lm32-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/lm32-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-lm32-rtems4.10-binutils
    477 # Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-lm32-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/lm32-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/lm32-rtems4.10-cpp.1*
    494482%{_mandir}/man1/lm32-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/lm32-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/lm32-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/lm32-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/lm32-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/lm32-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/lm32-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "lm32-rtems4.10" != "bfin-rtems4.10"
    509494%if "lm32-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/lm32-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/lm32-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/lm32-rtems4.10
    521 %dir %{gccexec}/lm32-rtems4.10/%{gcc_version}
    522 %{gccexec}/lm32-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/lm32-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/lm32-rtems4.10
     506%dir %{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/lm32-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/lm32-rtems4.10
    613 %dir %{gccexec}/lm32-rtems4.10/%{gcc_version}
    614 %{gccexec}/lm32-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/lm32-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/lm32-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/lm32-rtems4.10
     587%dir %{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/lm32-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/lm32-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/m32c/rtems-4.10-m32c-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    133135
    134136Requires:       rtems-4.10-m32c-rtems4.10-binutils
    135 Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    136 
    137 
    138 %if "%{gcc_version}" >= "3.4"
    139 %define gcclib %{_libdir}/gcc
    140 %define gccexec %{_libexecdir}/gcc
    141 %else
    142 %define gcclib %{_libdir}/gcc-lib
    143 %define gccexec %{_libdir}/gcc-lib
    144 %endif
    145 
    146 %if "%{gcc_version}" == "4.4.0"
    147 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    148 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    149 %endif
     137Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     138
     139
     140%define _gcclibdir %{_prefix}/lib
     141
    150142%if "%{gcc_version}" == "4.4.1"
    151143Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    152 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     144Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    153145%endif
    154146%{?_without_sources:NoSource:   0}
     
    225217    --exec_prefix=%{_exec_prefix} \
    226218    --includedir=%{_includedir} \
    227     --libdir=%{_libdir} \
     219    --libdir=%{_gcclibdir} \
    228220    --libexecdir=%{_libexecdir} \
    229221    --mandir=%{_mandir} \
     
    270262  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    271263    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    272       $RPM_BUILD_ROOT%{gcclib}/m32c-rtems4.10/%{gcc_version}/include/
     264      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include/
    273265  fi
    274266%endif
    275267
    276268  # host library
     269%if "%{gcc_version}" >= "4.2.0"
     270  # libiberty doesn't honor --libdir, but always installs to a
     271  # magically guessed _libdir
    277272  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     273%else
     274  # libiberty installs to --libdir=...
     275  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     276%endif
    278277
    279278  # We use the version from binutils
     
    287286  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
    288287
    289 
    290 %if "%{gcc_version}" >= "3.4"
    291288  # Bug in gcc-3.4.0pre
    292289  rm -f $RPM_BUILD_ROOT%{_bindir}/m32c-rtems4.10-m32c-rtems4.10-gcjh%{_exeext}
    293 %endif
    294 
    295 %if "%{gcc_version}" >= "3.3"
     290
    296291  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    297292  # the fixinclude-install-tools
    298   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/m32c-rtems4.10/%{gcc_version}/install-tools
    299   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m32c-rtems4.10/%{gcc_version}/install-tools
    300 %endif
     293  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/install-tools
     294  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/install-tools
    301295
    302296  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    323317  echo "%dir %{_prefix}" >> dirs
    324318  echo "%dir %{_libdir}" >> dirs
    325 %if "%{gcc_version}" >= "3.4"
    326319  echo "%dir %{_libexecdir}" >> dirs
    327 %endif
    328   echo "%dir %{gcclib}" >> dirs
    329   echo "%dir %{gcclib}/m32c-rtems4.10" >> dirs
    330 
    331   TGTDIR="%{gcclib}/m32c-rtems4.10/%{gcc_version}"
     320  echo "%dir %{_gcclibdir}/gcc" >> dirs
     321  echo "%dir %{_gcclibdir}/gcc/m32c-rtems4.10" >> dirs
     322
     323  TGTDIR="%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}"
    332324  for i in $f; do
    333325    case $i in
     
    341333  # Collect files to go into different packages
    342334  cp dirs build/files.gcc
    343   cp dirs build/files.g77
    344335  cp dirs build/files.gfortran
    345336  cp dirs build/files.objc
     
    347338  cp dirs build/files.g++
    348339
    349   TGTDIR="%{gcclib}/m32c-rtems4.10/%{gcc_version}"
     340  TGTDIR="%{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}"
    350341  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    351342  for i in $f; do
     
    362353    *include/g++*);;
    363354    *include/c++*);;
     355    *finclude/*);;
    364356    *adainclude*);;
    365357    *adalib*);;
     
    416408#!/bin/sh
    417409grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32c-rtems4.10/(lib|include|sys-root)' \
    418   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m32c-rtems4.10/' | %__find_provides
     410  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.10/'} | %__find_provides
    419411EOF
    420412chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    424416#!/bin/sh
    425417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32c-rtems4.10/(lib|include|sys-root)' \
    426   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m32c-rtems4.10/' | %__find_requires
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32c-rtems4.10/'} | %__find_requires
    427419EOF
    428420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    464456# Version:        %{gcc_rpmvers}
    465457# Requires:       rtems-4.10-m32c-rtems4.10-binutils
    466 # Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     458# Requires:       rtems-4.10-m32c-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    467459# License:      GPL
    468460
     
    479471%dir %{_mandir}/man1
    480472%{_mandir}/man1/m32c-rtems4.10-gcc.1*
    481 %if "%{gcc_version}" >= "3.4"
    482473%{_mandir}/man1/m32c-rtems4.10-cpp.1*
    483474%{_mandir}/man1/m32c-rtems4.10-gcov.1*
    484 %endif
    485475
    486476%dir %{_bindir}
    487477%{_bindir}/m32c-rtems4.10-cpp%{_exeext}
    488478%{_bindir}/m32c-rtems4.10-gcc%{_exeext}
    489 %if "%{gcc_version}" >= "3.3"
    490479%{_bindir}/m32c-rtems4.10-gcc-%{gcc_version}%{_exeext}
    491 %endif
    492480%{_bindir}/m32c-rtems4.10-gcov%{_exeext}
    493481%{_bindir}/m32c-rtems4.10-gccbug
    494482
    495 %dir %{gcclib}/m32c-rtems4.10/%{gcc_version}/include
     483%dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include
    496484%if "%{gcc_version}" > "4.0.3"
    497485%if "m32c-rtems4.10" != "bfin-rtems4.10"
    498486%if "m32c-rtems4.10" != "avr-rtems4.10"
    499 %dir %{gcclib}/m32c-rtems4.10/%{gcc_version}/include/ssp
     487%dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include/ssp
    500488%endif
    501489%endif
     
    503491
    504492%if "%{gcc_version}" >= "4.3.0"
    505 %dir %{gcclib}/m32c-rtems4.10/%{gcc_version}/include-fixed
    506 %endif
    507 
    508 %dir %{gccexec}
    509 %dir %{gccexec}/m32c-rtems4.10
    510 %dir %{gccexec}/m32c-rtems4.10/%{gcc_version}
    511 %{gccexec}/m32c-rtems4.10/%{gcc_version}/cc1%{_exeext}
    512 %{gccexec}/m32c-rtems4.10/%{gcc_version}/collect2%{_exeext}
     493%dir %{_gcclibdir}/gcc/m32c-rtems4.10/%{gcc_version}/include-fixed
     494%endif
     495
     496%dir %{_libexecdir}/gcc
     497%dir %{_libexecdir}/gcc/m32c-rtems4.10
     498%dir %{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}
     499%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/cc1%{_exeext}
     500%{_libexecdir}/gcc/m32c-rtems4.10/%{gcc_version}/collect2%{_exeext}
    513501
    514502
     
    523511License:        Distributable
    524512Version:        %{newlib_version}
    525 Release:        44%{?dist}
     513Release:        46%{?dist}
    526514
    527515
  • contrib/crossrpms/rtems4.10/m32r/rtems-4.10-m32r-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    133135
    134136Requires:       rtems-4.10-m32r-rtems4.10-binutils
    135 Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    136 
    137 
    138 %if "%{gcc_version}" >= "3.4"
    139 %define gcclib %{_libdir}/gcc
    140 %define gccexec %{_libexecdir}/gcc
    141 %else
    142 %define gcclib %{_libdir}/gcc-lib
    143 %define gccexec %{_libdir}/gcc-lib
    144 %endif
    145 
    146 %if "%{gcc_version}" == "4.4.0"
    147 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    148 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    149 %endif
     137Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     138
     139
     140%define _gcclibdir %{_prefix}/lib
     141
    150142%if "%{gcc_version}" == "4.4.1"
    151143Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    152 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     144Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    153145%endif
    154146%{?_without_sources:NoSource:   0}
     
    225217    --exec_prefix=%{_exec_prefix} \
    226218    --includedir=%{_includedir} \
    227     --libdir=%{_libdir} \
     219    --libdir=%{_gcclibdir} \
    228220    --libexecdir=%{_libexecdir} \
    229221    --mandir=%{_mandir} \
     
    270262  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    271263    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    272       $RPM_BUILD_ROOT%{gcclib}/m32r-rtems4.10/%{gcc_version}/include/
     264      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include/
    273265  fi
    274266%endif
    275267
    276268  # host library
     269%if "%{gcc_version}" >= "4.2.0"
     270  # libiberty doesn't honor --libdir, but always installs to a
     271  # magically guessed _libdir
    277272  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     273%else
     274  # libiberty installs to --libdir=...
     275  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     276%endif
    278277
    279278  # We use the version from binutils
     
    287286  rm -rf $RPM_BUILD_ROOT%{_mandir}/man7
    288287
    289 
    290 %if "%{gcc_version}" >= "3.4"
    291288  # Bug in gcc-3.4.0pre
    292289  rm -f $RPM_BUILD_ROOT%{_bindir}/m32r-rtems4.10-m32r-rtems4.10-gcjh%{_exeext}
    293 %endif
    294 
    295 %if "%{gcc_version}" >= "3.3"
     290
    296291  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    297292  # the fixinclude-install-tools
    298   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/m32r-rtems4.10/%{gcc_version}/install-tools
    299   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m32r-rtems4.10/%{gcc_version}/install-tools
    300 %endif
     293  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/install-tools
     294  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/install-tools
    301295
    302296  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    323317  echo "%dir %{_prefix}" >> dirs
    324318  echo "%dir %{_libdir}" >> dirs
    325 %if "%{gcc_version}" >= "3.4"
    326319  echo "%dir %{_libexecdir}" >> dirs
    327 %endif
    328   echo "%dir %{gcclib}" >> dirs
    329   echo "%dir %{gcclib}/m32r-rtems4.10" >> dirs
    330 
    331   TGTDIR="%{gcclib}/m32r-rtems4.10/%{gcc_version}"
     320  echo "%dir %{_gcclibdir}/gcc" >> dirs
     321  echo "%dir %{_gcclibdir}/gcc/m32r-rtems4.10" >> dirs
     322
     323  TGTDIR="%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}"
    332324  for i in $f; do
    333325    case $i in
     
    341333  # Collect files to go into different packages
    342334  cp dirs build/files.gcc
    343   cp dirs build/files.g77
    344335  cp dirs build/files.gfortran
    345336  cp dirs build/files.objc
     
    347338  cp dirs build/files.g++
    348339
    349   TGTDIR="%{gcclib}/m32r-rtems4.10/%{gcc_version}"
     340  TGTDIR="%{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}"
    350341  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    351342  for i in $f; do
     
    362353    *include/g++*);;
    363354    *include/c++*);;
     355    *finclude/*);;
    364356    *adainclude*);;
    365357    *adalib*);;
     
    416408#!/bin/sh
    417409grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32r-rtems4.10/(lib|include|sys-root)' \
    418   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m32r-rtems4.10/' | %__find_provides
     410  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.10/'} | %__find_provides
    419411EOF
    420412chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    424416#!/bin/sh
    425417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m32r-rtems4.10/(lib|include|sys-root)' \
    426   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m32r-rtems4.10/' | %__find_requires
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m32r-rtems4.10/'} | %__find_requires
    427419EOF
    428420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    464456# Version:        %{gcc_rpmvers}
    465457# Requires:       rtems-4.10-m32r-rtems4.10-binutils
    466 # Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     458# Requires:       rtems-4.10-m32r-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    467459# License:      GPL
    468460
     
    479471%dir %{_mandir}/man1
    480472%{_mandir}/man1/m32r-rtems4.10-gcc.1*
    481 %if "%{gcc_version}" >= "3.4"
    482473%{_mandir}/man1/m32r-rtems4.10-cpp.1*
    483474%{_mandir}/man1/m32r-rtems4.10-gcov.1*
    484 %endif
    485475
    486476%dir %{_bindir}
    487477%{_bindir}/m32r-rtems4.10-cpp%{_exeext}
    488478%{_bindir}/m32r-rtems4.10-gcc%{_exeext}
    489 %if "%{gcc_version}" >= "3.3"
    490479%{_bindir}/m32r-rtems4.10-gcc-%{gcc_version}%{_exeext}
    491 %endif
    492480%{_bindir}/m32r-rtems4.10-gcov%{_exeext}
    493481%{_bindir}/m32r-rtems4.10-gccbug
    494482
    495 %dir %{gcclib}/m32r-rtems4.10/%{gcc_version}/include
     483%dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include
    496484%if "%{gcc_version}" > "4.0.3"
    497485%if "m32r-rtems4.10" != "bfin-rtems4.10"
    498486%if "m32r-rtems4.10" != "avr-rtems4.10"
    499 %dir %{gcclib}/m32r-rtems4.10/%{gcc_version}/include/ssp
     487%dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include/ssp
    500488%endif
    501489%endif
     
    503491
    504492%if "%{gcc_version}" >= "4.3.0"
    505 %dir %{gcclib}/m32r-rtems4.10/%{gcc_version}/include-fixed
    506 %endif
    507 
    508 %dir %{gccexec}
    509 %dir %{gccexec}/m32r-rtems4.10
    510 %dir %{gccexec}/m32r-rtems4.10/%{gcc_version}
    511 %{gccexec}/m32r-rtems4.10/%{gcc_version}/cc1%{_exeext}
    512 %{gccexec}/m32r-rtems4.10/%{gcc_version}/collect2%{_exeext}
     493%dir %{_gcclibdir}/gcc/m32r-rtems4.10/%{gcc_version}/include-fixed
     494%endif
     495
     496%dir %{_libexecdir}/gcc
     497%dir %{_libexecdir}/gcc/m32r-rtems4.10
     498%dir %{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}
     499%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/cc1%{_exeext}
     500%{_libexecdir}/gcc/m32r-rtems4.10/%{gcc_version}/collect2%{_exeext}
    513501
    514502
     
    523511License:        Distributable
    524512Version:        %{newlib_version}
    525 Release:        44%{?dist}
     513Release:        46%{?dist}
    526514
    527515
  • contrib/crossrpms/rtems4.10/m68k/rtems-4.10-m68k-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-m68k-rtems4.10-binutils
    136 Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/m68k-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.10-m68k-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/m68k-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/m68k-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/m68k-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/m68k-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/m68k-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/m68k-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-m68k-rtems4.10-binutils
    477 # Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-m68k-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/m68k-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/m68k-rtems4.10-cpp.1*
    494482%{_mandir}/man1/m68k-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/m68k-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/m68k-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/m68k-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/m68k-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/m68k-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "m68k-rtems4.10" != "bfin-rtems4.10"
    509494%if "m68k-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/m68k-rtems4.10
    521 %dir %{gccexec}/m68k-rtems4.10/%{gcc_version}
    522 %{gccexec}/m68k-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/m68k-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/m68k-rtems4.10
     506%dir %{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/m68k-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/m68k-rtems4.10
    613 %dir %{gccexec}/m68k-rtems4.10/%{gcc_version}
    614 %{gccexec}/m68k-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/m68k-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/m68k-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/m68k-rtems4.10
     587%dir %{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/m68k-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/m68k-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/mips/rtems-4.10-mips-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-mips-rtems4.10-binutils
    136 Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/mips-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.10-mips-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/mips-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/mips-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/mips-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/mips-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/mips-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/mips-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-mips-rtems4.10-binutils
    477 # Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-mips-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/mips-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/mips-rtems4.10-cpp.1*
    494482%{_mandir}/man1/mips-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/mips-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/mips-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/mips-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/mips-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/mips-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "mips-rtems4.10" != "bfin-rtems4.10"
    509494%if "mips-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/mips-rtems4.10
    521 %dir %{gccexec}/mips-rtems4.10/%{gcc_version}
    522 %{gccexec}/mips-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/mips-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/mips-rtems4.10
     506%dir %{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/mips-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/mips-rtems4.10
    613 %dir %{gccexec}/mips-rtems4.10/%{gcc_version}
    614 %{gccexec}/mips-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/mips-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/mips-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/mips-rtems4.10
     587%dir %{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/mips-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/mips-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/powerpc/rtems-4.10-powerpc-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-powerpc-rtems4.10-binutils
    136 Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/powerpc-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.10-powerpc-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/powerpc-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/powerpc-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/powerpc-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/powerpc-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/powerpc-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/powerpc-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-powerpc-rtems4.10-binutils
    477 # Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-powerpc-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/powerpc-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/powerpc-rtems4.10-cpp.1*
    494482%{_mandir}/man1/powerpc-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/powerpc-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/powerpc-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/powerpc-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/powerpc-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/powerpc-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "powerpc-rtems4.10" != "bfin-rtems4.10"
    509494%if "powerpc-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/powerpc-rtems4.10
    521 %dir %{gccexec}/powerpc-rtems4.10/%{gcc_version}
    522 %{gccexec}/powerpc-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/powerpc-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/powerpc-rtems4.10
     506%dir %{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/powerpc-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/powerpc-rtems4.10
    613 %dir %{gccexec}/powerpc-rtems4.10/%{gcc_version}
    614 %{gccexec}/powerpc-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/powerpc-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/powerpc-rtems4.10
     587%dir %{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/powerpc-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/powerpc-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/sh/rtems-4.10-sh-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-sh-rtems4.10-binutils
    136 Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/sh-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.10-sh-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sh-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/sh-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/sh-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/sh-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/sh-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sh-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-sh-rtems4.10-binutils
    477 # Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-sh-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/sh-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/sh-rtems4.10-cpp.1*
    494482%{_mandir}/man1/sh-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/sh-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/sh-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/sh-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/sh-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/sh-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "sh-rtems4.10" != "bfin-rtems4.10"
    509494%if "sh-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/sh-rtems4.10
    521 %dir %{gccexec}/sh-rtems4.10/%{gcc_version}
    522 %{gccexec}/sh-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/sh-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/sh-rtems4.10
     506%dir %{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/sh-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/sh-rtems4.10
    613 %dir %{gccexec}/sh-rtems4.10/%{gcc_version}
    614 %{gccexec}/sh-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/sh-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/sh-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/sh-rtems4.10
     587%dir %{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/sh-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/sh-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
  • contrib/crossrpms/rtems4.10/sparc/rtems-4.10-sparc-rtems4.10-gcc.spec

    ra2acf4f0 rcdc1b12  
    5959Group:          Development/Tools
    6060Version:        %{gcc_rpmvers}
    61 Release:        4%{?dist}
     61Release:        6%{?dist}
    6262License:        GPL
    6363URL:            http://gcc.gnu.org
     
    101101%{?fc11:%global mpfr_provided 2.4.1}
    102102%{?suse10_3:%global mpfr_provided 2.2.1}
     103%{?suse11_0:%global mpfr_provided 2.3.1}
     104%{?suse11_1:%global mpfr_provided 2.3.2}
    103105%{?cygwin:%global mpfr_provided 2.4.1}
    104106%{?mingw32:%global mpfr_provided %{nil}}
     
    134136Requires:       rtems-4.10-gcc-common
    135137Requires:       rtems-4.10-sparc-rtems4.10-binutils
    136 Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-44%{?dist}
    137 
    138 
    139 %if "%{gcc_version}" >= "3.4"
    140 %define gcclib %{_libdir}/gcc
    141 %define gccexec %{_libexecdir}/gcc
    142 %else
    143 %define gcclib %{_libdir}/gcc-lib
    144 %define gccexec %{_libdir}/gcc-lib
    145 %endif
    146 
    147 %if "%{gcc_version}" == "4.4.0"
    148 Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    149 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090421.diff
    150 %endif
     138Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-46%{?dist}
     139
     140
     141%define _gcclibdir %{_prefix}/lib
     142
    151143%if "%{gcc_version}" == "4.4.1"
    152144Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2
    153 Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090722.diff
     145Patch0:         ftp://ftp.rtems.org/pub/rtems/SOURCES/4.10/gcc-core-%{gcc_pkgvers}-rtems4.10-20090820.diff
    154146%endif
    155147%{?_without_sources:NoSource:   0}
    156148
    157 %if "%{gcc_version}" == "4.4.0"
    158 Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
    159 %endif
    160149%if "%{gcc_version}" == "4.4.1"
    161150Source1:        ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2
     
    237226    --exec_prefix=%{_exec_prefix} \
    238227    --includedir=%{_includedir} \
    239     --libdir=%{_libdir} \
     228    --libdir=%{_gcclibdir} \
    240229    --libexecdir=%{_libexecdir} \
    241230    --mandir=%{_mandir} \
     
    283272  if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then
    284273    mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \
    285       $RPM_BUILD_ROOT%{gcclib}/sparc-rtems4.10/%{gcc_version}/include/
     274      $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include/
    286275  fi
    287276%endif
    288277
    289278  # host library
     279%if "%{gcc_version}" >= "4.2.0"
     280  # libiberty doesn't honor --libdir, but always installs to a
     281  # magically guessed _libdir
    290282  rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a
     283%else
     284  # libiberty installs to --libdir=...
     285  rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a
     286%endif
    291287
    292288  # We use the version from binutils
     
    298294  touch $RPM_BUILD_ROOT%{_infodir}/dir
    299295
    300 
    301 %if "%{gcc_version}" >= "3.4"
    302296  # Bug in gcc-3.4.0pre
    303297  rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.10-sparc-rtems4.10-gcjh%{_exeext}
    304 %endif
    305 
    306 %if "%{gcc_version}" >= "3.3"
     298
    307299  # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs
    308300  # the fixinclude-install-tools
    309   rm -rf ${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.10/%{gcc_version}/install-tools
    310   rm -rf ${RPM_BUILD_ROOT}%{gccexec}/sparc-rtems4.10/%{gcc_version}/install-tools
    311 %endif
     301  rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/install-tools
     302  rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/install-tools
    312303
    313304  # Bug in gcc > 4.1.0: Installs an unused, empty directory
     
    334325  echo "%dir %{_prefix}" >> dirs
    335326  echo "%dir %{_libdir}" >> dirs
    336 %if "%{gcc_version}" >= "3.4"
    337327  echo "%dir %{_libexecdir}" >> dirs
    338 %endif
    339   echo "%dir %{gcclib}" >> dirs
    340   echo "%dir %{gcclib}/sparc-rtems4.10" >> dirs
    341 
    342   TGTDIR="%{gcclib}/sparc-rtems4.10/%{gcc_version}"
     328  echo "%dir %{_gcclibdir}/gcc" >> dirs
     329  echo "%dir %{_gcclibdir}/gcc/sparc-rtems4.10" >> dirs
     330
     331  TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}"
    343332  for i in $f; do
    344333    case $i in
     
    352341  # Collect files to go into different packages
    353342  cp dirs build/files.gcc
    354   cp dirs build/files.g77
    355343  cp dirs build/files.gfortran
    356344  cp dirs build/files.objc
     
    358346  cp dirs build/files.g++
    359347
    360   TGTDIR="%{gcclib}/sparc-rtems4.10/%{gcc_version}"
     348  TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}"
    361349  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    362350  for i in $f; do
     
    373361    *include/g++*);;
    374362    *include/c++*);;
     363    *finclude/*);;
    375364    *adainclude*);;
    376365    *adalib*);;
     
    427416#!/bin/sh
    428417grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.10/(lib|include|sys-root)' \
    429   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.10/' | %__find_provides
     418  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.10/'} | %__find_provides
    430419EOF
    431420chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides
     
    435424#!/bin/sh
    436425grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.10/(lib|include|sys-root)' \
    437   | grep -v '^${RPM_BUILD_ROOT}%{gcclib}/sparc-rtems4.10/' | %__find_requires
     426  %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.10/'} | %__find_requires
    438427EOF
    439428chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires
     
    475464# Version:        %{gcc_rpmvers}
    476465# Requires:       rtems-4.10-sparc-rtems4.10-binutils
    477 # Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-44%{?dist}
     466# Requires:       rtems-4.10-sparc-rtems4.10-newlib = %{newlib_version}-46%{?dist}
    478467# License:      GPL
    479468
     
    490479%dir %{_mandir}/man1
    491480%{_mandir}/man1/sparc-rtems4.10-gcc.1*
    492 %if "%{gcc_version}" >= "3.4"
    493481%{_mandir}/man1/sparc-rtems4.10-cpp.1*
    494482%{_mandir}/man1/sparc-rtems4.10-gcov.1*
    495 %endif
    496483
    497484%dir %{_bindir}
    498485%{_bindir}/sparc-rtems4.10-cpp%{_exeext}
    499486%{_bindir}/sparc-rtems4.10-gcc%{_exeext}
    500 %if "%{gcc_version}" >= "3.3"
    501487%{_bindir}/sparc-rtems4.10-gcc-%{gcc_version}%{_exeext}
    502 %endif
    503488%{_bindir}/sparc-rtems4.10-gcov%{_exeext}
    504489%{_bindir}/sparc-rtems4.10-gccbug
    505490
    506 %dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include
     491%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include
    507492%if "%{gcc_version}" > "4.0.3"
    508493%if "sparc-rtems4.10" != "bfin-rtems4.10"
    509494%if "sparc-rtems4.10" != "avr-rtems4.10"
    510 %dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include/ssp
     495%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include/ssp
    511496%endif
    512497%endif
     
    514499
    515500%if "%{gcc_version}" >= "4.3.0"
    516 %dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include-fixed
    517 %endif
    518 
    519 %dir %{gccexec}
    520 %dir %{gccexec}/sparc-rtems4.10
    521 %dir %{gccexec}/sparc-rtems4.10/%{gcc_version}
    522 %{gccexec}/sparc-rtems4.10/%{gcc_version}/cc1%{_exeext}
    523 %{gccexec}/sparc-rtems4.10/%{gcc_version}/collect2%{_exeext}
     501%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include-fixed
     502%endif
     503
     504%dir %{_libexecdir}/gcc
     505%dir %{_libexecdir}/gcc/sparc-rtems4.10
     506%dir %{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}
     507%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/cc1%{_exeext}
     508%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/collect2%{_exeext}
    524509
    525510# ==============================================================
     
    546531%{_infodir}/gcc.info*
    547532%{_infodir}/gccint.info*
    548 %if "%{gcc_version}" >= "3.4"
    549533%{_infodir}/gccinstall.info*
    550 %endif
    551534
    552535%dir %{_mandir}
    553 %if "%{gcc_version}" < "3.4"
    554 %dir %{_mandir}/man1
    555 %{_mandir}/man1/cpp.1*
    556 %{_mandir}/man1/gcov.1*
    557 %endif
    558536%dir %{_mandir}/man7
    559537%{_mandir}/man7/fsf-funding.7*
     
    566544  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    567545  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    568 %if "%{gcc_version}" >= "3.4"
    569546  /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    570 %endif
    571547
    572548%preun -n rtems-4.10-gcc-common
     
    576552  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || :
    577553  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || :
    578 %if "%{gcc_version}" >= "3.4"
    579554  /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || :
    580 %endif
    581555fi
    582556
     
    609583%{_bindir}/sparc-rtems4.10-g++%{_exeext}
    610584
    611 %dir %{gccexec}
    612 %dir %{gccexec}/sparc-rtems4.10
    613 %dir %{gccexec}/sparc-rtems4.10/%{gcc_version}
    614 %{gccexec}/sparc-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
    615 
    616 %dir %{gcclib}/sparc-rtems4.10/%{gcc_version}/include
    617 %{gcclib}/sparc-rtems4.10/%{gcc_version}/include/c++
     585%dir %{_libexecdir}/gcc
     586%dir %{_libexecdir}/gcc/sparc-rtems4.10
     587%dir %{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}
     588%{_libexecdir}/gcc/sparc-rtems4.10/%{gcc_version}/cc1plus%{_exeext}
     589
     590%dir %{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include
     591%{_gcclibdir}/gcc/sparc-rtems4.10/%{gcc_version}/include/c++
    618592
    619593
     
    627601License:        Distributable
    628602Version:        %{newlib_version}
    629 Release:        44%{?dist}
     603Release:        46%{?dist}
    630604
    631605Requires:       rtems-4.10-newlib-common
     
    647621Group:          Development/Tools
    648622Version:        %{newlib_version}
    649 Release:        44%{?dist}
     623Release:        46%{?dist}
    650624License:        Distributable
    651625
Note: See TracChangeset for help on using the changeset viewer.