Changeset 69b742e in rtems


Ignore:
Timestamp:
Mar 11, 2003, 12:40:35 PM (17 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
c599ce7b
Parents:
5ba8f30
Message:

Merger from rtems-4-6-branch.

Location:
scripts
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • scripts/ChangeLog

    r5ba8f30 r69b742e  
    1 2003-02-26      RTEMS
    2 
    3         * setup.def: Updated gdb revision to -2 so arm will build and
    4         to fix psim build problem on NetBSD.   
    5         * gcc3newlib/gccnewlib.add: Ignore dependency on GNAT RPM since
    6         RedHat 7.3 doesn't have it available.  Maybe later.
    7         * gdb/Makefile.am: Cleanup way the RPM_SPECS_DATA variable is built.
     12003-02-26      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * gcc3newlib/gccnewlib.add: Add %gcc_version, %newlib_version.
     4        Apply %gcc_version, %newlib_version.
     5        * gcc3newlib/target-c++.add: Apply %gcc_version, %newlib_version.
     6        * gcc3newlib/target-g77.add: Apply %gcc_version, %newlib_version.
     7        * gcc3newlib/target-gcc.add: Apply %gcc_version, %newlib_version.
     8        * gcc3newlib/target-gcj.add: Apply %gcc_version, %newlib_version.
     9        * gcc3newlib/target-gnat.add: Apply %gcc_version, %newlib_version.
     10        * gcc3newlib/target-objc.add: Apply %gcc_version, %newlib_version.
    811
    9122003-02-11      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
  • scripts/gcc3newlib/gccnewlib.add

    r5ba8f30 r69b742e  
     1
     2%define gcc_version     @gcc_version@
     3%define newlib_version  @newlib_version@
     4
    15Name:         @target_alias@-gcc-newlib
    26Summary:      gcc and newlib C Library for @target_alias@.
     
    812Packager:       corsepiu@faw.uni-ulm.de and joel@OARcorp.com
    913
    10 Version:        gcc@gcc_version@newlib@newlib_version@
     14Version:        gcc%{gcc_version}newlib%{newlib_version}
    1115# gcc 3.x and gcc 2.9
    12 Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz
    13 # Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.bz2
     16Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}.tar.gz
     17# Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}.tar.bz2
    1418# gcc 2.95.x
    15 # Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.bz2
    16 Source1:        ftp://sources.redhat.com/pub/newlib/newlib-@newlib_version@.tar.gz
     19# Source0:      ftp://ftp.gnu.org/pub/gnu/gcc/gcc-%{gcc_version}.tar.bz2
     20Source1:        ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz
    1721@PATCH1@
    1822@PATCH3@
     
    3640# those targets wanting to support ada.
    3741
    38 %if "@gcc_version@" >= "3.2"
     42%if "%{gcc_version}" >= "3.2"
    3943# default to building gnat
    4044%define _gnat   %{?gnat:%gnat}%{!?gnat:1}
     
    4751# those targets wanting to support gcj.
    4852
    49 %if "@gcc_version@" >= "3.2"
     53%if "%{gcc_version}" >= "3.2"
    5054# default to building gcj
    5155%define _gcj    %{?gcj:%gcj}%{!?gcj:1}
     
    136140@PATCH4@
    137141
    138   cd gcc-@gcc_version@
    139     sed -e 's/\(version_string = \"[^\"]*\)/\1 (OAR Corporation gcc-@gcc_version@-@gcc_patch_version@\/newlib-@newlib_version@-@newlib_patch_version@ @Release@)/' \
     142  cd gcc-%{gcc_version}
     143    sed -e 's/\(version_string = \"[^\"]*\)/\1 (OAR Corporation gcc-%{gcc_version}-@gcc_patch_version@\/newlib-%{newlib_version}-@newlib_patch_version@-@Release@)/' \
    140144    gcc/version.c > gcc/version.c~
    141145    mv gcc/version.c~  gcc/version.c
     
    146150
    147151  # Copy the C library into gcc's source tree
    148   ln -s ../newlib-@newlib_version@/newlib gcc-@gcc_version@
     152  ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_version}
    149153  test -d build || mkdir build
    150154
     
    172176  languages="$languages,ada"
    173177%endif
    174   ../gcc-@gcc_version@/configure \
     178  ../gcc-%{gcc_version}/configure \
    175179    --build=%_build --host=%_host \
    176180    --target=@target_alias@ \
     
    185189  # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs
    186190  test -d gcc/include || mkdir -p gcc/include
    187   cp ../gcc-@gcc_version@/gcc/gsyslimits.h gcc/include/syslimits.h
    188 %endif
    189 
    190 %if %build_gnat
    191   cd ../gcc-@gcc_version@/gcc/ada
     191  cp ../gcc-%{gcc_version}/gcc/gsyslimits.h gcc/include/syslimits.h
     192%endif
     193
     194%if %build_gnat
     195  cd ../gcc-%{gcc_version}/gcc/ada
    192196  touch treeprs.ads [es]info.h nmake.ad[bs]
    193197  cd ../../../build
     
    210214# Let gnatlib building find newlib's headers
    211215  GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/@target_alias@/newlib/targ-include"
    212   GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/../newlib-@newlib_version@/newlib/libc/include"
     216  GNATLIBCFLAGS="$GNATLIBCFLAGS -isystem `pwd`/../newlib-%{newlib_version}/newlib/libc/include"
    213217# Without this xgcc doesn't find the target's binutils.
    214218  GNATLIBCFLAGS="$GNATLIBCFLAGS -B%{_prefix}/@target_alias@/bin/"
     
    224228# Bug in gcc-2.95.1: It doesn't build this installation directory
    225229# If it doesn't find it, gcc doesn't install @target_alias@/bin/gcc
    226 %if "@gcc_version@" < "3.0"
    227   ../gcc-@gcc_version@/mkinstalldirs \
     230%if "%{gcc_version}" < "3.0"
     231  ../gcc-%{gcc_version}/mkinstalldirs \
    228232    $RPM_BUILD_ROOT%{_prefix}/@target_alias@/bin
    229233%endif
     
    250254  rm -f  ${RPM_BUILD_ROOT}%{_prefix}/lib/libiberty.a
    251255
    252 %if "@gcc_version@" < "3.0"
     256%if "%{gcc_version}" < "3.0"
    253257  # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
    254258  # Rename it to target_alias-cpp
     
    274278  f=`gcc/xgcc -Bgcc/ --print-multi-lib | sed -e 's,;.*$,,'`
    275279
    276   TGTDIR="%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@"
     280  TGTDIR="%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}"
    277281  for i in $f; do
    278282    case $i in
     
    301305  cp dirs files.g++
    302306
    303   TGTDIR="%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@"
     307  TGTDIR="%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}"
    304308  f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
    305309  for i in $f; do
  • scripts/gcc3newlib/target-c++.add

    r5ba8f30 r69b742e  
    2323%{_prefix}/bin/@target_alias@-c++filt%{_exeext}
    2424
    25 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1plus%{_exeext}
    26 %dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include
    27 %if "@gcc_version@" >= "3.2"
    28 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/c++
     25%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/cc1plus%{_exeext}
     26%dir %{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include
     27%if "%{gcc_version}" >= "3.2"
     28%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/c++
    2929%else
    30 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/g++
     30%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/g++
    3131%endif
    3232%endif
  • scripts/gcc3newlib/target-g77.add

    r5ba8f30 r69b742e  
    1919%{_prefix}/bin/@target_alias@-g77%{_exeext}
    2020
    21 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/f771%{_exeext}
     21%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/f771%{_exeext}
    2222%endif
  • scripts/gcc3newlib/target-gcc.add

    r5ba8f30 r69b742e  
    2323%{_prefix}/@target_alias@/include
    2424
    25 %dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include
     25%dir %{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include
  • scripts/gcc3newlib/target-gcj.add

    r5ba8f30 r69b742e  
    2323%{_prefix}/man/man1/@target_alias@-gcj.1
    2424
    25 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jc1%{_exeext}
    26 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain%{_exeext}
     25%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/jc1%{_exeext}
     26%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/jvgenmain%{_exeext}
    2727
    2828%endif
  • scripts/gcc3newlib/target-gnat.add

    r5ba8f30 r69b742e  
    2020%{_prefix}/bin/@target_alias@-gnat*
    2121
    22 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/gnat1%{_exeext}
    23 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/adalib
    24 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/adainclude
     22%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/gnat1%{_exeext}
     23%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/adalib
     24%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/adainclude
    2525%endif
  • scripts/gcc3newlib/target-objc.add

    r5ba8f30 r69b742e  
    1616%files -n @target_alias@-objc -f build/files.objc
    1717%defattr(-,root,root)
    18 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj%{_exeext}
    19 %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc
     18%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/cc1obj%{_exeext}
     19%{_prefix}/lib/gcc-lib/@target_alias@/%{gcc_version}/include/objc
    2020%endif
Note: See TracChangeset for help on using the changeset viewer.