Changeset 4b3af7a4 in rtems


Ignore:
Timestamp:
Feb 5, 2002, 9:08:15 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
5bca94b
Parents:
0ab87349
Message:

2002-01-29 Ralf Corsepius <corsepiu@…>

  • mkbinutilspec.in, mkgccnewlibspec.in, gccnewlib/base-chill.add, gccnewlib/base-g77.add, gccnewlib/base-gcc.add, gccnewlib/base-gcj.add, gccnewlib/gccnewlib.add, gccnewlib/target-chill.add, gccnewlib/target-g77.add, gccnewlib/target-gcc.add, gccnewlib/target-gcj.add, gccnewlib/target-objc.add: Added more support for Canadian Cross building.
Location:
scripts
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • scripts/ChangeLog

    r0ab87349 r4b3af7a4  
     12002-01-29      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * mkbinutilspec.in, mkgccnewlibspec.in, gccnewlib/base-chill.add,
     4        gccnewlib/base-g77.add, gccnewlib/base-gcc.add,
     5        gccnewlib/base-gcj.add, gccnewlib/gccnewlib.add,
     6        gccnewlib/target-chill.add, gccnewlib/target-g77.add,
     7        gccnewlib/target-gcc.add, gccnewlib/target-gcj.add,
     8        gccnewlib/target-objc.add: Added more support for Canadian Cross
     9        building.
     10
    1112001-01-30      Joel Sherrill <joel@OARcorp.com>
    212
  • scripts/gccnewlib/base-chill.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n rtems-base-chill
    16 %dir /opt/rtems/info
    17 %doc /opt/rtems/info/chill.info*.gz
     16%dir %{_prefix}/info
     17%doc %{_prefix}/info/chill.info*.gz
    1818
    1919%post -n rtems-base-chill
    20   if test -d $RPM_INSTALL_PREFIX/rtems/info;
     20  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
    2121  then
    22     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    23     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     22    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     23    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
    2424    test -n "$f" && for i in $f; do
    25       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     25      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    2626    done
    2727  fi
    2828
    2929%postun -n rtems-base-chill
    30   if test -d $RPM_INSTALL_PREFIX/rtems/info;
     30  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
    3131  then
    32     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    33     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     32    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     33    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
    3434    test -n "$f" && for i in $f; do
    35       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     35      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    3636    done
    3737  fi
  • scripts/gccnewlib/base-g77.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n rtems-base-g77
    16 %dir /opt/rtems/info
    17 %doc /opt/rtems/info/g77.info*.gz
     16%dir %{_prefix}/info
     17%doc %{_prefix}/info/g77.info*.gz
    1818
    19 %dir /opt/rtems/man
    20 %dir /opt/rtems/man/man1
    21 %doc /opt/rtems/man/man1/@target_alias@-g77.1
     19%dir %{_prefix}/man
     20%dir %{_prefix}/man/man1
     21%doc %{_prefix}/man/man1/@target_alias@-g77.1
    2222
    2323%post -n rtems-base-g77
    24   if test -d $RPM_INSTALL_PREFIX/rtems/info;
     24  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
    2525  then
    26     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    27     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     26    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     27    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
    2828    test -n "$f" && for i in $f; do
    29       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     29      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    3030    done
    3131  fi
    3232
    3333%postun -n rtems-base-g77
    34   if test -d $RPM_INSTALL_PREFIX/rtems/info;
     34  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
    3535  then
    36     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    37     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     36    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     37    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
    3838    test -n "$f" && for i in $f; do
    39       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     39      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    4040    done
    4141  fi
  • scripts/gccnewlib/base-gcc.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n rtems-base-gcc
    16 %dir /opt/rtems/info
    17 %doc /opt/rtems/info/cpp.info*.gz
    18 %doc /opt/rtems/info/gcc.info*.gz
    19 %doc /opt/rtems/info/libc.info*.gz
    20 %doc /opt/rtems/info/libm.info*.gz
     16%dir %{_prefix}/info
     17%doc %{_prefix}/info/cpp.info*.gz
     18%doc %{_prefix}/info/gcc.info*.gz
     19%doc %{_prefix}/info/libc.info*.gz
     20%doc %{_prefix}/info/libm.info*.gz
    2121
    22 %dir /opt/rtems/bin
    23 /opt/rtems/bin/gcov@exe_ext@
     22%dir %{_prefix}/bin
     23%{_prefix}/bin/gcov@exe_ext@
    2424
    25 %dir /opt/rtems/man
    26 %dir /opt/rtems/man/man1
    27 %doc /opt/rtems/man/man1/cccp.1
     25%dir %{_prefix}/man
     26%dir %{_prefix}/man/man1
     27%doc %{_prefix}/man/man1/cccp.1
    2828
    29 %dir /opt/rtems/include
    30 /opt/rtems/include/g++-3
     29%dir %{_prefix}/include
     30%{_prefix}/include/g++-3
    3131
    3232%post -n rtems-base-gcc
    33   if test -d $RPM_INSTALL_PREFIX/rtems/info;
     33  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
    3434  then
    35     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    36     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     35    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     36    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
    3737    test -n "$f" && for i in $f; do
    38       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     38      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    3939    done
    4040  fi
    4141
    4242%postun -n rtems-base-gcc
    43   if test -d $RPM_INSTALL_PREFIX/rtems/info;
     43  if test -d $RPM_INSTALL_PREFIX%{_prefix}/info;
    4444  then
    45     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    46     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     45    rm -f $RPM_INSTALL_PREFIX%{_prefix}/info/dir
     46    f=`find $RPM_INSTALL_PREFIX%{_prefix}/info -name '*.info.gz'`
    4747    test -n "$f" && for i in $f; do
    48       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     48      install-info $i $RPM_INSTALL_PREFIX%{_prefix}/info/dir
    4949    done
    5050  fi
  • scripts/gccnewlib/base-gcj.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n rtems-base-gcj
    16 %dir /opt/rtems/bin
    17 /opt/rtems/bin/jcf-dump@exe_ext@
    18 /opt/rtems/bin/jv-scan@exe_ext@
    19 /opt/rtems/bin/gcjh@exe_ext@
     16%dir %{_prefix}/bin
     17%{_prefix}/bin/jcf-dump@exe_ext@
     18%{_prefix}/bin/jv-scan@exe_ext@
     19%{_prefix}/bin/gcjh@exe_ext@
    2020
  • scripts/gccnewlib/gccnewlib.add

    r0ab87349 r4b3af7a4  
    66# please send bugfixes or comments to joel@OARcorp.com
    77#
     8
     9%define _prefix @prefix@
    810
    911Vendor:       OAR Corporation
     
    2325# gcc 2.95.x
    2426Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/gcc-everything-@gcc_version@.tar.gz
    25 Source1:        ftp://sourceware.cygnus.com/pub/newlib/newlib-@newlib_version@.tar.gz
     27Source1:        ftp://sources.redhat.com/pub/newlib/newlib-@newlib_version@.tar.gz
    2628Patch0:         gcc-@gcc_version@-rtems-@gcc_patch_version@.diff
    2729Patch1:         newlib-@newlib_version@-rtems-@newlib_patch_version@.diff
    28 Buildroot:      /tmp/@target_alias@-gcc-newlib
     30Buildroot:      %{_tmppath}/%{name}
    2931
    3032#
     
    5961%prep
    6062# untar the sources inside @target_alias@-gcc-newlib
    61 %setup -c -n @target_alias@-gcc-newlib -a 0 -a 1
     63%setup -c -n %{name} -a 0 -a 1
    6264
    6365%patch0 -p0
     
    7173  cd build
    7274
    73   ../gcc-@gcc_version@/configure --target=@target_alias@ \
     75# HACK: This should be %{target} != %{build}, but SuSE's rpm screws it.
     76%if "%{target_os}" != "%{build_os}"
     77  CONFIGURE_ARGS="--build=%{_build} --host=%{_target}"
     78%endif
     79
     80  ../gcc-@gcc_version@/configure $CONFIGURE_ARGS --target=@target_alias@ \
    7481    --with-gnu-as --with-gnu-ld --with-newlib --verbose \
    75     --enable-threads --prefix=/opt/rtems @GCCLANGS@
     82    --enable-threads --prefix=%{_prefix} @GCCLANGS@
    7683
    7784  make all
     
    8390  # If it doesn't find it, gcc doesn't install @target_alias@/bin/gcc
    8491  ../gcc-@gcc_version@/mkinstalldirs \
    85     $RPM_BUILD_ROOT/opt/rtems/@target_alias@/bin
     92    $RPM_BUILD_ROOT%{_prefix}/@target_alias@/bin
    8693
    87   make prefix=$RPM_BUILD_ROOT/opt/rtems install
     94  make prefix=$RPM_BUILD_ROOT%{_prefix} install
    8895  cd @target_alias@/newlib
    89   make prefix=$RPM_BUILD_ROOT/opt/rtems install-info
     96  make prefix=$RPM_BUILD_ROOT%{_prefix} install-info
    9097
    9198  # cd back to build/
     
    94101  # Bug in gcc-2.95.x: It bogusly tries to share cpp for all targets.
    95102  # Rename it to target_alias-cpp
    96   if test -f $RPM_BUILD_ROOT/opt/rtems/bin/cpp@exe_ext@;
     103  if test -f $RPM_BUILD_ROOT%{_prefix}/bin/cpp@exe_ext@;
    97104  then
    98     mv $RPM_BUILD_ROOT/opt/rtems/bin/cpp@exe_ext@ \
    99       $RPM_BUILD_ROOT/opt/rtems/bin/@target_alias@-cpp@exe_ext@
     105    mv $RPM_BUILD_ROOT%{_prefix}/bin/cpp@exe_ext@ \
     106      $RPM_BUILD_ROOT%{_prefix}/bin/@target_alias@-cpp@exe_ext@
    100107  fi
    101108
    102109  # gzip info files
    103   gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null
    104   gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
    105   gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null
     110  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info 2>/dev/null
     111  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-? 2>/dev/null
     112  gzip -f $RPM_BUILD_ROOT%{_prefix}/info/*.info-?? 2>/dev/null
    106113
    107114  rm -f dirs ;
    108   echo "%dir /opt/rtems/lib" >> dirs ;
    109   echo "%dir /opt/rtems/lib/gcc-lib" >> dirs ;
    110   echo "%dir /opt/rtems/lib/gcc-lib/@target_alias@" >> dirs ;
     115  echo "%dir %{_prefix}/lib" >> dirs ;
     116  echo "%dir %{_prefix}/lib/gcc-lib" >> dirs ;
     117  echo "%dir %{_prefix}/lib/gcc-lib/@target_alias@" >> dirs ;
    111118
    112119  # Collect multilib subdirectories
    113   TGTDIR="/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@"
     120  TGTDIR="%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@"
    114121  f=`gcc/xgcc --print-multi-lib | sed -e 's,;.*$,,'`
    115122  for i in $f; do
     
    145152%clean
    146153# let rpm --clean remove BuildRoot iif using the default BuildRoot
    147   test "$RPM_BUILD_ROOT" = "/tmp/@target_alias@-gcc-newlib" && \
     154  test "$RPM_BUILD_ROOT" = "%{_tmppath}/%{name}" && \
    148155    rm -rf $RPM_BUILD_ROOT
    149156
  • scripts/gccnewlib/target-chill.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n @target_alias@-chill -f build/files.chill
    16 %dir /opt/rtems/bin
    17 /opt/rtems/bin/@target_alias@-chill
     16%dir %{_prefix}/bin
     17%{_prefix}/bin/@target_alias@-chill
    1818
  • scripts/gccnewlib/target-g77.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n @target_alias@-g77 -f build/files.g77
    16 %dir /opt/rtems/bin
    17 /opt/rtems/bin/@target_alias@-g77@exe_ext@
     16%dir %{_prefix}/bin
     17%{_prefix}/bin/@target_alias@-g77@exe_ext@
    1818
    19 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@
     19%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@
  • scripts/gccnewlib/target-gcc.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n @target_alias@-gcc -f build/files.gcc
    16 %doc /opt/rtems/man/man1/@target_alias@-gcc.1
    17 %doc /opt/rtems/man/man1/@target_alias@-g++.1
     16%doc %{_prefix}/man/man1/@target_alias@-gcc.1
     17%doc %{_prefix}/man/man1/@target_alias@-g++.1
    1818
    19 /opt/rtems/bin/@target_alias@-cpp@exe_ext@
    20 /opt/rtems/bin/@target_alias@-c++@exe_ext@
    21 /opt/rtems/bin/@target_alias@-g++@exe_ext@
    22 /opt/rtems/bin/@target_alias@-gcc@exe_ext@
    23 /opt/rtems/bin/@target_alias@-protoize@exe_ext@
    24 /opt/rtems/bin/@target_alias@-unprotoize@exe_ext@
     19%{_prefix}/bin/@target_alias@-cpp@exe_ext@
     20%{_prefix}/bin/@target_alias@-c++@exe_ext@
     21%{_prefix}/bin/@target_alias@-g++@exe_ext@
     22%{_prefix}/bin/@target_alias@-gcc@exe_ext@
     23%{_prefix}/bin/@target_alias@-protoize@exe_ext@
     24%{_prefix}/bin/@target_alias@-unprotoize@exe_ext@
    2525
    26 %dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
     26%dir %{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include
    2727
    28 /opt/rtems/@target_alias@
     28%{_prefix}/@target_alias@
    2929
  • scripts/gccnewlib/target-gcj.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n @target_alias@-gcj -f build/files.gcj
    16 %dir /opt/rtems/bin
    17 /opt/rtems/bin/@target_alias@-gcj@exe_ext@
     16%dir %{_prefix}/bin
     17%{_prefix}/bin/@target_alias@-gcj@exe_ext@
    1818
    19 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@
    20 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@
     19%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@
     20%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@
    2121
  • scripts/gccnewlib/target-objc.add

    r0ab87349 r4b3af7a4  
    1414
    1515%files -n @target_alias@-objc -f build/files.objc
    16 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@
    17 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc
     16%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@
     17%{_prefix}/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc
  • scripts/mkbinutilspec.in

    r0ab87349 r4b3af7a4  
    5454    -e "s%@rpm_build_root\@%${rpm_build_root}%g" \
    5555    -e "s%@target_alias\@%${target_alias}%g" \
     56    -e "s%@prefix\@%@prefix@%g" \
    5657    -e "s%@binutils_version\@%${binutils_version}%g" \
    5758    -e "s%@binutils_patch_version\@%${binutils_patch_version}%g" \
  • scripts/mkgccnewlibspec.in

    r0ab87349 r4b3af7a4  
    6060sed -e "s%@Release\@%${gccnewlib_rpm_release}%g" \
    6161    -e "s%@target_alias\@%${target_alias}%g" \
     62    -e "s%@prefix\@%@prefix@%g" \
    6263    -e "s%@rpm_build_root\@%${rpm_build_root}%g" \
    6364    -e "s%@gcc_version\@%${gcc_version}%g" \
Note: See TracChangeset for help on using the changeset viewer.