Changeset 40605a2 in rtems


Ignore:
Timestamp:
Mar 17, 2004, 5:14:07 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
08b1e43
Parents:
c2cbaba
Message:

2004-03-17 Ralf Corsepius <corsepiu@…>

  • gcc3newlib/gccnewlib.add: Preps. for gcc-3.4.0. Add %gcclib, %gccexec.
Location:
scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • scripts/ChangeLog

    rc2cbaba r40605a2  
     12004-03-17      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * gcc3newlib/gccnewlib.add: Preps. for gcc-3.4.0.
     4        Add %gcclib, %gccexec.
     5
    162004-03-15      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    27
  • scripts/gcc3newlib/gccnewlib.add

    rc2cbaba r40605a2  
    126126%endif
    127127
     128%if "%{gcc_version}" >= "3.4"
     129%define gcclib %{_libdir}/gcc
     130%define gccexec %{_libexecdir}/gcc
     131%else
     132%define gcclib %{_libdir}/gcc-lib
     133%define gccexec %{_libdir}/gcc-lib
     134%endif
     135
    128136%description
    129137RTEMS is an open source operating system for embedded systems.
     
    149157
    150158  cd gcc-%{gcc_version}
    151     sed -e 's/\(version_string = \"[^\"]*\)/\1 (OAR Corporation gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
     159    sed -e 's/\(version_string = \"[^\"]*\)/\1 (RTEMS gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
    152160    gcc/version.c > gcc/version.c~
    153161    mv gcc/version.c~  gcc/version.c
     
    289297  rm -f $RPM_BUILD_ROOT%{_prefix}/info/dir
    290298
     299%if "%{gcc_version}" >= "3.4"
     300  # Bug in gcc-3.4.0pre
     301  rm -f $RPM_BUILD_ROOT%{_prefix}/bin/%{gcc_target}-%{gcc_target}-gcjh%{_exeext}
     302%endif
     303
    291304%if "%{gcc_version}" >= "3.3"
    292305  # Bug in gcc-3.3.x: Despite we don't need fixincludes, it installs
    293306  # the fixinclude-install-tools
    294   rm -rf ${RPM_BUILD_ROOT}%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}/install-tools
     307  rm -rf ${RPM_BUILD_ROOT}%{gccexec}/%{gcc_target}/%{gcc_version}/install-tools
    295308%endif
    296309
     
    316329  echo "%defattr(-,root,root)" >> dirs
    317330  echo "%dir %{_prefix}/lib" >> dirs ;
    318   echo "%dir %{_prefix}/lib/gcc-lib" >> dirs ;
    319   echo "%dir %{_prefix}/lib/gcc-lib/%{gcc_target}" >> dirs ;
     331  echo "%dir %{gcclib}" >> dirs ;
     332  echo "%dir %{gcclib}/%{gcc_target}" >> dirs ;
    320333
    321334  # Collect multilib subdirectories
    322335  f=`gcc/xgcc -Bgcc/ --print-multi-lib | sed -e 's,;.*$,,'`
    323336
    324   TGTDIR="%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}"
     337  TGTDIR="%{gcclib}/%{gcc_target}/%{gcc_version}"
    325338  for i in $f; do
    326339    case $i in
     
    349362  cp dirs files.g++
    350363
    351   TGTDIR="%{_prefix}/lib/gcc-lib/%{gcc_target}/%{gcc_version}"
     364  TGTDIR="%{gcclib}/%{gcc_target}/%{gcc_version}"
    352365  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    353366  for i in $f; do
     
    355368    *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs
    356369    *f771) ;;
     370    *cc1) ;;
    357371    *cc1obj) ;;
     372    *collect2) ;;
    358373    *libobjc*) echo "$i" >> files.objc ;;
    359374    *include/objc*) ;;
Note: See TracChangeset for help on using the changeset viewer.