Changeset 213c518 in rtems


Ignore:
Timestamp:
10/25/99 19:35:56 (24 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
c8c14c43
Parents:
c302d7a3
Message:

Patch generated from scripts-19991025-0.tar.gz from
Ralf Corsepius <corsepiu@…>:

Most significant changes:

  • Names for rpms changed again
  • gccnewlib.rpm split into 3 rpms, one for chill, gcj, gcc (includes c/c++/f77/objc), simultaneously built from a common *.spec.
  • small patches with major impact to gcc and newlib (Those fixes mentioned to Ian, ie. libobjc/libchill are built, multilibing works)
  • gcc patch against gcc-2.95.2 (Should also apply to gcc-2.95.1 without major problems)
  • Buildroot removed from */*spec.in
  • New: rpm Group: "rtems" (rpm -q -g rtems reports all RTEMS packages)
Location:
scripts
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • scripts/Makefile.in

    rc302d7a3 r213c518  
    1 # Makefile.in generated automatically by automake 1.4a from Makefile.am
     1# Makefile.in generated automatically by automake 1.4 from Makefile.am
    22
    33# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
    … …  
    4747
    4848INSTALL = @INSTALL@
    49 INSTALL_PROGRAM = @INSTALL_PROGRAM@
     49INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    5050INSTALL_DATA = @INSTALL_DATA@
    5151INSTALL_SCRIPT = @INSTALL_SCRIPT@
    52 INSTALL_STRIP_FLAG =
    5352transform = @program_transform_name@
    5453
    … …  
    102101DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
    103102
    104 TAR = gtar
     103TAR = tar
    105104GZIP_ENV = --best
    106105all: all-redirect
    … …  
    261260          d=$(srcdir); \
    262261          if test -d $$d/$$file; then \
    263             cp -pr $$d/$$file $(distdir)/$$file; \
     262            cp -pr $$/$$file $(distdir)/$$file; \
    264263          else \
    265264            test -f $(distdir)/$$file \
    … …  
    300299all-redirect: all-recursive
    301300install-strip:
    302         $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
     301        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    303302installdirs: installdirs-recursive
    304303installdirs-am:

  • scripts/aclocal.m4

    rc302d7a3 r213c518  
    1 dnl aclocal.m4 generated automatically by aclocal 1.4a
     1dnl aclocal.m4 generated automatically by aclocal 1.4
    22
    33dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
    … …  
    2222AC_DEFUN(AM_INIT_AUTOMAKE,
    2323[AC_REQUIRE([AC_PROG_INSTALL])
    24 dnl We require 2.13 because we rely on SHELL being computed by configure.
    25 AC_PREREQ([2.13])
    2624PACKAGE=[$1]
    2725AC_SUBST(PACKAGE)

  • scripts/binutils/Makefile.in

    rc302d7a3 r213c518  
    1 # Makefile.in generated automatically by automake 1.4a from Makefile.am
     1# Makefile.in generated automatically by automake 1.4 from Makefile.am
    22
    33# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
    … …  
    4747
    4848INSTALL = @INSTALL@
    49 INSTALL_PROGRAM = @INSTALL_PROGRAM@
     49INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    5050INSTALL_DATA = @INSTALL_DATA@
    5151INSTALL_SCRIPT = @INSTALL_SCRIPT@
    52 INSTALL_STRIP_FLAG =
    5352transform = @program_transform_name@
    5453
    … …  
    9897DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
    9998
    100 TAR = gtar
     99TAR = tar
    101100GZIP_ENV = --best
    102101all: all-redirect
    … …  
    140139          d=$(srcdir); \
    141140          if test -d $$d/$$file; then \
    142             cp -pr $$d/$$file $(distdir)/$$file; \
     141            cp -pr $$/$$file $(distdir)/$$file; \
    143142          else \
    144143            test -f $(distdir)/$$file \
    … …  
    169168all-redirect: all-am
    170169install-strip:
    171         $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
     170        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    172171installdirs:
    173172        $(mkinstalldirs)  $(DESTDIR)$(RPM_SPECSdir)

  • scripts/binutils/binutils.spec.in

    rc302d7a3 r213c518  
    1212Release:      @Release@
    1313Copyright:    1999 OARCorp
    14 Group:        unsorted
     14Group:        rtems
    1515Provides:     @target_alias@-binutils
    1616
    1717Autoreqprov:    on
    1818Packager:       corsepiu@faw.uni-ulm.de and joel@OARcorp.com
    19 Buildroot:      @rpm_build_root@
    2019Prefix:         /opt
    2120

  • scripts/configure

    rc302d7a3 r213c518  
    690690
    691691
    692 
    693692PACKAGE=scripts
    694693
    695 VERSION=19991022-0
     694VERSION=19991025-0
    696695
    697696if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
    … …  
    703702missing_dir=`cd $ac_aux_dir && pwd`
    704703echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
    705 echo "configure:706: checking for working aclocal" >&5
     704echo "configure:705: checking for working aclocal" >&5
    706705# Run test in a subshell; some versions of sh will print an error if
    707706# an executable is not found, even if stderr is redirected.
    … …  
    716715
    717716echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
    718 echo "configure:719: checking for working autoconf" >&5
     717echo "configure:718: checking for working autoconf" >&5
    719718# Run test in a subshell; some versions of sh will print an error if
    720719# an executable is not found, even if stderr is redirected.
    … …  
    729728
    730729echo $ac_n "checking for working automake""... $ac_c" 1>&6
    731 echo "configure:732: checking for working automake" >&5
     730echo "configure:731: checking for working automake" >&5
    732731# Run test in a subshell; some versions of sh will print an error if
    733732# an executable is not found, even if stderr is redirected.
    … …  
    742741
    743742echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
    744 echo "configure:745: checking for working autoheader" >&5
     743echo "configure:744: checking for working autoheader" >&5
    745744# Run test in a subshell; some versions of sh will print an error if
    746745# an executable is not found, even if stderr is redirected.
    … …  
    755754
    756755echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
    757 echo "configure:758: checking for working makeinfo" >&5
     756echo "configure:757: checking for working makeinfo" >&5
    758757# Run test in a subshell; some versions of sh will print an error if
    759758# an executable is not found, even if stderr is redirected.
    … …  
    779778# others might use /usr/src
    780779echo $ac_n "checking for rpm SPECS directory""... $ac_c" 1>&6
    781 echo "configure:782: checking for rpm SPECS directory" >&5
     780echo "configure:781: checking for rpm SPECS directory" >&5
    782781if test -d /usr/src/packages/SPECS;
    783782then

  • scripts/configure.in

    rc302d7a3 r213c518  
    22
    33AC_INIT(binutils)
    4 AM_INIT_AUTOMAKE(scripts,19991022-0,no)
     4AM_INIT_AUTOMAKE(scripts,19991025-0,no)
    55
    66# RTEMS_CHECK_VERSION(..)

  • scripts/gccnewlib/Makefile.in

    rc302d7a3 r213c518  
    1 # Makefile.in generated automatically by automake 1.4a from Makefile.am
     1# Makefile.in generated automatically by automake 1.4 from Makefile.am
    22
    33# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
    … …  
    4747
    4848INSTALL = @INSTALL@
    49 INSTALL_PROGRAM = @INSTALL_PROGRAM@
     49INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    5050INSTALL_DATA = @INSTALL_DATA@
    5151INSTALL_SCRIPT = @INSTALL_SCRIPT@
    52 INSTALL_STRIP_FLAG =
    5352transform = @program_transform_name@
    5453
    … …  
    9897DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
    9998
    100 TAR = gtar
     99TAR = tar
    101100GZIP_ENV = --best
    102101all: all-redirect
    … …  
    140139          d=$(srcdir); \
    141140          if test -d $$d/$$file; then \
    142             cp -pr $$d/$$file $(distdir)/$$file; \
     141            cp -pr $$/$$file $(distdir)/$$file; \
    143142          else \
    144143            test -f $(distdir)/$$file \
    … …  
    169168all-redirect: all-am
    170169install-strip:
    171         $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
     170        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    172171installdirs:
    173172        $(mkinstalldirs)  $(DESTDIR)$(RPM_SPECSdir)

  • scripts/gccnewlib/gccnewlib.spec.in

    rc302d7a3 r213c518  
    11#
    2 # spec file for package rtems
     2# spec file for building gcc for rtems
    33#
    44# Copyright  (c)  1999  OARCorp, Huntsville, AL
    … …  
    99Vendor:       OAR Corporation
    1010Distribution: Linux
    11 Name:         @target_alias@-gcc
     11Name:         @target_alias@-gcc-newlib
    1212Summary:      gcc and newlib C Library for @target_alias@.
    13 Group:        unsorted
     13Group:        rtems
    1414Release:      @Release@
    1515Copyright:    1999 OARCorp
    1616
    17 Provides:     @target_alias@-gcc-newlib
     17Provides:     @target_alias@-gcc @target_alias@-chill @target_alias@-gcj
    1818Requires:     @target_alias@-binutils
    1919
    … …  
    2121Packager:     corsepiu@faw.uni-ulm.de and joel@OARcorp.com
    2222
    23 Version:      @gcc_version@newlib@newlib_version@
     23Version:      gcc@gcc_version@newlib@newlib_version@
    2424Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz
    2525Source1:        ftp://sourceware.cygnus/com/pub/newlib/newlib-@newlib_version@.tar.gz
    … …  
    4040NoSource:      0, 1
    4141
    42 Buildroot:      @rpm_build_root@
    43 
    4442%description
    4543RTEMS is an open source operating system for embedded systems.
    4644
     45This is gcc's and newlib C Library's sources with patch for RTEMS.
     46
     47 The original sources are not included in the source RPM.
     48 If we included them, then the source RPMs for each target
     49 would duplicate MBs of source unnecessarily.  This is
     50 a duplication of over 30 MBs of source for each of
     51 the more than 10 targets it is possible to build.
     52
     53 You can get them yourself from the Internet and copy them to
     54 your /usr/src/redhat/SOURCES directory ($RPM_SOURCE_DIR).
     55 Or you can try the ftp options of rpm :-)
     56
     57%package -n @target_alias@-gcc
     58Summary:      rtems gcc and newlib C Library for @target_alias@
     59Group: rtems
     60Requires: @target_alias@-binutils
     61
     62%description -n @target_alias@-gcc
     63RTEMS is an open source operating system for embedded systems.
     64
    4765This is gcc and newlib C Library for @target_alias@.
    4866
    49 Authors:
    50 --------
    51     Joel Sherrill (joel@oarcorp.com)
    52     ...
    53 
    54 %package -n @target_alias@-gcc-newlib
    55 Summary:      rtems gcc and newlib C Library for target @target_alias@
    56 Group: unsorted
    57 
    58 %description -n @target_alias@-gcc-newlib
    59 RTEMS is an open source operating system for embedded systems.
    60 
    61 This is gcc and newlib C Library for @target_alias@.
    62 
    63 Authors:
    64 --------
    65     Joel Sherrill (joel@oarcorp.com)
    66     ...
     67%package -n @target_alias@-chill
     68Summary:      gcc/chill compiler for @target_alias@
     69Group: rtems
     70Requires: @target_alias@-gcc
     71
     72%description -n @target_alias@-chill
     73RTEMS is an open source operating system for embedded systems.
     74
     75This is the gcc/chill compiler and support files for @target_alias@
     76
     77%package -n @target_alias@-gcj
     78Summary:      gcc/java compiler (gcj) for @target_alias@
     79Group: rtems
     80Requires: @target_alias@-gcc
     81
     82%description -n @target_alias@-gcj
     83RTEMS is an open source operating system for embedded systems.
     84
     85This is the gcc/java compiler and support files for @target_alias@
    6786
    6887%prep
    … …  
    84103
    85104  # for now we are building all the languages
    86   #  '--enable-languages=c c++'
     105  #  '--enable-languages=c,c++'
    87106
    88107  make all
    … …  
    116135  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null
    117136
    118 %post
    119   if test -d $RPM_INSTALL_PREFIX/rtems/info;
    120   then
    121     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    122     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
    123     test -n "$f" && for i in $f; do
    124       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
    125     done
    126   fi
    127 
    128 %postun
    129   if test -d $RPM_INSTALL_PREFIX/rtems/info;
    130   then
    131     rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    132     f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
    133     test -n "$f" && for i in $f; do
    134       install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
    135     done
    136   fi
    137 
    138 %files -n @target_alias@-gcc-newlib
     137  rm -f dirs ;
     138  # Collect multilib subdirectories
     139  TGTDIR="$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@"
     140  find $TGTDIR \
     141    \( -type d -a ! -path "$TGTDIR/include*" \) -print | \
     142    sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> dirs
     143
     144  # Collect files to go into different packages
     145  cp dirs files.chill
     146  cp dirs files.gcc
     147  f=`find $TGTDIR ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`;
     148  for i in $f; do
     149    case $i in
     150    *chill*) echo "$i" >> files.chill ;;
     151    *jc1) ;;
     152    *jvgenmain) ;;
     153    *) echo "$i" >> files.gcc ;;
     154    esac
     155  done
     156
     157%post -n @target_alias@-gcc
     158  if test -d $RPM_INSTALL_PREFIX/rtems/info;
     159  then
     160    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
     161    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     162    test -n "$f" && for i in $f; do
     163      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     164    done
     165  fi
     166
     167%postun -n @target_alias@-gcc
     168  if test -d $RPM_INSTALL_PREFIX/rtems/info;
     169  then
     170    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
     171    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     172    test -n "$f" && for i in $f; do
     173      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     174    done
     175  fi
     176
     177%files -n @target_alias@-gcc -f build/files.gcc
    139178%dir /opt/rtems/info
    140179%doc /opt/rtems/info/dir
    141 %doc /opt/rtems/info/chill.info*
    142180%doc /opt/rtems/info/cpp.info*
    143181%doc /opt/rtems/info/gcc.info*
    … …  
    155193%dir /opt/rtems/bin
    156194/opt/rtems/bin/cpp
    157 /opt/rtems/bin/jv-scan
    158195/opt/rtems/bin/gcov
    159 /opt/rtems/bin/jcf-dump
    160 /opt/rtems/bin/gcjh
    161196/opt/rtems/bin/@target_alias@-c++
    162197/opt/rtems/bin/@target_alias@-g++
    163198/opt/rtems/bin/@target_alias@-gcc
    164 /opt/rtems/bin/@target_alias@-gcj
    165 /opt/rtems/bin/@target_alias@-chill
    166199/opt/rtems/bin/@target_alias@-g77
    167200/opt/rtems/bin/@target_alias@-protoize
    … …  
    169202
    170203%dir /opt/rtems/lib
    171 # We use libiberty from binutils
    172 # /opt/rtems/lib/libiberty*
     204
     205%dir /opt/rtems/lib/gcc-lib
     206%dir /opt/rtems/lib/gcc-lib/@target_alias@
     207%dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include
     208%dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc
     209
    173210%dir /opt/rtems/include
    174211/opt/rtems/include/g++-3
    175 
     212/opt/rtems/@target_alias@
     213
     214%post -n @target_alias@-chill
     215  if test -d $RPM_INSTALL_PREFIX/rtems/info;
     216  then
     217    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
     218    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     219    test -n "$f" && for i in $f; do
     220      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     221    done
     222  fi
     223
     224%postun -n @target_alias@-chill
     225  if test -d $RPM_INSTALL_PREFIX/rtems/info;
     226  then
     227    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
     228    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
     229    test -n "$f" && for i in $f; do
     230      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
     231    done
     232  fi
     233
     234%files -n @target_alias@-chill -f build/files.chill
     235%dir /opt/rtems/bin
     236/opt/rtems/bin/@target_alias@-chill
     237
     238%dir /opt/rtems/info
     239%doc /opt/rtems/info/dir
     240%doc /opt/rtems/info/chill.info*
     241
     242%dir /opt/rtems/lib
    176243%dir /opt/rtems/lib/gcc-lib
    177 /opt/rtems/lib/gcc-lib/@target_alias@
    178 
    179 /opt/rtems/@target_alias@
     244%dir /opt/rtems/lib/gcc-lib/@target_alias@
     245
     246%files -n @target_alias@-gcj
     247%dir /opt/rtems/bin
     248/opt/rtems/bin/jcf-dump
     249/opt/rtems/bin/jv-scan
     250/opt/rtems/bin/gcjh
     251/opt/rtems/bin/@target_alias@-gcj
     252
     253%dir /opt/rtems/lib
     254%dir /opt/rtems/lib/gcc-lib
     255%dir /opt/rtems/lib/gcc-lib/@target_alias@
     256/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1
     257/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain
     258

  • scripts/gdb/Makefile.in

    rc302d7a3 r213c518  
    1 # Makefile.in generated automatically by automake 1.4a from Makefile.am
     1# Makefile.in generated automatically by automake 1.4 from Makefile.am
    22
    33# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
    … …  
    4747
    4848INSTALL = @INSTALL@
    49 INSTALL_PROGRAM = @INSTALL_PROGRAM@
     49INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    5050INSTALL_DATA = @INSTALL_DATA@
    5151INSTALL_SCRIPT = @INSTALL_SCRIPT@
    52 INSTALL_STRIP_FLAG =
    5352transform = @program_transform_name@
    5453
    … …  
    9897DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
    9998
    100 TAR = gtar
     99TAR = tar
    101100GZIP_ENV = --best
    102101all: all-redirect
    … …  
    140139          d=$(srcdir); \
    141140          if test -d $$d/$$file; then \
    142             cp -pr $$d/$$file $(distdir)/$$file; \
     141            cp -pr $$/$$file $(distdir)/$$file; \
    143142          else \
    144143            test -f $(distdir)/$$file \
    … …  
    169168all-redirect: all-am
    170169install-strip:
    171         $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
     170        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    172171installdirs:
    173172        $(mkinstalldirs)  $(DESTDIR)$(RPM_SPECSdir)

  • scripts/gdb/gdb.spec.in

    rc302d7a3 r213c518  
    3737NoSource:      0
    3838
    39 
    40 Buildroot:      @rpm_build_root@
    4139
    4240%description
Note: See TracChangeset for help on using the changeset viewer.