Ignore:
Timestamp:
Oct 20, 1999, 8:23:16 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
2f23359
Parents:
e171450
Message:

Moved stuff to rtems subdirectory and made sure the system still
functioned.

Merged Ralf's changes into gccnewlib.spec.in.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/gccnewlib/gccnewlib.spec.in

    re171450 r6e608c43  
    4646%patch1 -p0
    4747
    48 ( cd gcc-@gcc_version@
    49 
    5048  # Now link the C library into the source tree
    51   ln -s ../newlib-1.8.2/newlib .
    52 )
     49  ln -s ../newlib-1.8.2/newlib gcc-@gcc_version@
    5350
    5451%build
    55 test -d build || mkdir build
    56 ( cd build
     52  test -d build || mkdir build
     53  cd build
    5754  ../gcc-@gcc_version@/configure --target=@target_alias@ \
    5855    --with-gnu-as --with-gnu-ld --with-newlib --verbose \
    5956    --prefix=/opt/rtems
    60   ../gcc-@gcc_version@/mkinstalldirs \
    61     $RPM_BUILD_ROOT/opt/rtems/@target_alias@/sys-include \
    62     $RPM_BUILD_ROOT/opt/rtems/@target_alias@/include
    6357
    64   srclimits=../gcc-@gcc_version@/newlib/libc/sys/rtems/include/limits.h
    65   for dir in $RPM_BUILD_ROOT/opt/rtems/@target_alias@/include \
    66              $RPM_BUILD_ROOT/opt/rtems/@target_alias@/sys-include
    67   do
    68     cp ${srclimits} ${dir}
    69   done
     58  # for now we are building all the languages
     59  #  '--enable-languages=c c++'
    7060
    71   #make LANGUAGES="c c++" all
    7261  make all
    7362  make info
    7463
    75   cd gcc
    76     rm -f stmp-multilib
    77     find . -name "*.a" -print | xargs -e rm -f
    78 
    79     make all
    80   cd ..
    81 )
     64#  Since gcc now finds the RTEMS limits.h, this should not be needed
     65#  cd gcc
     66#    rm -f stmp-multilib
     67#    find . -name "*.a" -print | xargs -e rm -f
     68#
     69#    make all
     70#  cd ..
    8271
    8372%install
    84 ( cd build
     73  cd build
    8574  make prefix=$RPM_BUILD_ROOT/opt/rtems install
    8675  cd @target_alias@/newlib
     
    8978  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null
    9079  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
    91 )
     80  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null
     81 
     82  if test -d "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@"; \
     83  then
     84    find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" -type d | \
     85      sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" > files.gcc-lib
     86    find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" -type f | \
     87      sed -e "s,^$RPM_BUILD_ROOT,,g" >> files.gcc-lib
     88  fi
    9289
    9390%post
     
    111108  fi
    112109
    113 %files
    114 %dir /opt/rtems/info
     110%files -f files.g++ -f files.gcc-lib
     111%docdir /opt/rtems/info
    115112%doc /opt/rtems/info/dir
    116113%doc /opt/rtems/info/chill.info*
     
    121118%doc /opt/rtems/info/libm.info*
    122119
    123 %dir /opt/rtems/man
    124 %dir /opt/rtems/man/man1
     120%docdir /opt/rtems/man
     121%docdir /opt/rtems/man/man1
    125122%doc /opt/rtems/man/man1/cccp.1
    126123%doc /opt/rtems/man/man1/@target_alias@-gcc.1
    127124%doc /opt/rtems/man/man1/@target_alias@-g++.1
     125%doc /opt/rtems/man/man1/@target_alias@-g77.1
    128126
    129127%dir /opt/rtems/bin
     
    133131/opt/rtems/bin/@target_alias@-gcc
    134132/opt/rtems/bin/@target_alias@-gcj
     133
    135134%dir /opt/rtems/lib
     135/opt/rtems/lib/libiberty*
     136%dir /opt/rtems/lib/include
     137
    136138%dir /opt/rtems/lib/gcc-lib
    137139%dir /opt/rtems/lib/gcc-lib/@target_alias@
    138 /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@
    139 /opt/rtems/@target_alias@/include
    140 /opt/rtems/@target_alias@/sys-include
     140# /opt/rtems/@target_alias@/include
     141# /opt/rtems/@target_alias@/sys-include
    141142/opt/rtems/@target_alias@/lib
     143
Note: See TracChangeset for help on using the changeset viewer.