Changeset 72d3f610 in rtems


Ignore:
Timestamp:
Oct 25, 1999, 2:15:09 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
04df848
Parents:
43d3a8e
Message:

Merged scripts-19991022-0 changes from Ralf.

Location:
scripts
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • scripts/Makefile.in

    r43d3a8e r72d3f610  
    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
    107106.SUFFIXES:
    108107$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    109         cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
    110 
    111 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
     108        cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
     109
     110Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
    112111        cd $(top_builddir) \
    113112          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
     
    258257        mkdir $(distdir)
    259258        -chmod 777 $(distdir)
    260         here=`cd $(top_builddir) && pwd`; \
    261         top_distdir=`cd $(distdir) && pwd`; \
    262         distdir=`cd $(distdir) && pwd`; \
    263         cd $(top_srcdir) \
    264           && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
    265259        @for file in $(DISTFILES); do \
    266260          d=$(srcdir); \
    267261          if test -d $$d/$$file; then \
    268             cp -pr $$d/$$file $(distdir)/$$file; \
     262            cp -pr $$/$$file $(distdir)/$$file; \
    269263          else \
    270264            test -f $(distdir)/$$file \
     
    305299all-redirect: all-recursive
    306300install-strip:
    307         $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
     301        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    308302installdirs: installdirs-recursive
    309303installdirs-am:
  • scripts/aclocal.m4

    r43d3a8e r72d3f610  
    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

    r43d3a8e r72d3f610  
    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
    103102.SUFFIXES:
    104103$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    105         cd $(top_srcdir) && $(AUTOMAKE) --foreign binutils/Makefile
    106 
    107 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
     104        cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps binutils/Makefile
     105
     106Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
    108107        cd $(top_builddir) \
    109108          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
     
    137136
    138137distdir: $(DISTFILES)
    139         here=`cd $(top_builddir) && pwd`; \
    140         top_distdir=`cd $(top_distdir) && pwd`; \
    141         distdir=`cd $(distdir) && pwd`; \
    142         cd $(top_srcdir) \
    143           && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign binutils/Makefile
    144138        @for file in $(DISTFILES); do \
    145139          d=$(srcdir); \
    146140          if test -d $$d/$$file; then \
    147             cp -pr $$d/$$file $(distdir)/$$file; \
     141            cp -pr $$/$$file $(distdir)/$$file; \
    148142          else \
    149143            test -f $(distdir)/$$file \
     
    174168all-redirect: all-am
    175169install-strip:
    176         $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
     170        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    177171installdirs:
    178172        $(mkinstalldirs)  $(DESTDIR)$(RPM_SPECSdir)
  • scripts/binutils/binutils.spec.in

    r43d3a8e r72d3f610  
    4848
    4949%prep
    50 echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
    5150# untar the sources inside @target_alias@-binutils
    5251%setup -c -n @target_alias@-binutils -a 0
    5352
    5453%patch0 -p0
     54  test -d build || mkdir build
    5555
    5656%build
    57   test -d build || mkdir build
    5857  cd build
    5958  ../binutils-@binutils_version@/configure --target=@target_alias@ \
     
    9089    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    9190    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
    92     test -n "$f" && for i in $f; do
     91    test x"$f" != x"" && for i in $f; do
    9392      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
    9493    done
     
    10099    rm -f $RPM_INSTALL_PREFIX/rtems/info/dir
    101100    f=`find $RPM_INSTALL_PREFIX/rtems/info -name '*.info.gz'`
    102     test -n "$f" && for i in $f; do
     101    test x"$f" != x"" && for i in $f; do
    103102      install-info $i $RPM_INSTALL_PREFIX/rtems/info/dir
    104103    done
     
    106105
    107106%files -f files
    108 %docdir /opt/rtems/info
     107%dir /opt/rtems/info
    109108%doc /opt/rtems/info/dir
    110109%doc /opt/rtems/info/as.info.gz
     
    119118%doc /opt/rtems/info/standards.info.gz
    120119
    121 %docdir /opt/rtems/man
    122 %docdir /opt/rtems/man/man1
     120%dir /opt/rtems/man
     121%dir /opt/rtems/man/man1
    123122%doc /opt/rtems/man/man1/@target_alias@-*.1
    124123
     
    162161
    163162%dir /opt/rtems/@target_alias@/lib
    164 %dir /opt/rtems/@target_alias@/lib/ldscripts
    165 /opt/rtems/@target_alias@/lib/ldscripts/*
     163/opt/rtems/@target_alias@/lib/ldscripts
  • scripts/configure

    r43d3a8e r72d3f610  
    690690
    691691
    692 
    693692PACKAGE=scripts
    694693
    695 VERSION=19991021-1
     694VERSION=19991022-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

    r43d3a8e r72d3f610  
    22
    33AC_INIT(binutils)
    4 AM_INIT_AUTOMAKE(scripts,19991021-1,no)
     4AM_INIT_AUTOMAKE(scripts,19991022-0,no)
    55
    66# RTEMS_CHECK_VERSION(..)
  • scripts/gccnewlib/Makefile.in

    r43d3a8e r72d3f610  
    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
    103102.SUFFIXES:
    104103$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    105         cd $(top_srcdir) && $(AUTOMAKE) --foreign gccnewlib/Makefile
    106 
    107 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
     104        cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps gccnewlib/Makefile
     105
     106Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
    108107        cd $(top_builddir) \
    109108          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
     
    137136
    138137distdir: $(DISTFILES)
    139         here=`cd $(top_builddir) && pwd`; \
    140         top_distdir=`cd $(top_distdir) && pwd`; \
    141         distdir=`cd $(distdir) && pwd`; \
    142         cd $(top_srcdir) \
    143           && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gccnewlib/Makefile
    144138        @for file in $(DISTFILES); do \
    145139          d=$(srcdir); \
    146140          if test -d $$d/$$file; then \
    147             cp -pr $$d/$$file $(distdir)/$$file; \
     141            cp -pr $$/$$file $(distdir)/$$file; \
    148142          else \
    149143            test -f $(distdir)/$$file \
     
    174168all-redirect: all-am
    175169install-strip:
    176         $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
     170        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    177171installdirs:
    178172        $(mkinstalldirs)  $(DESTDIR)$(RPM_SPECSdir)
  • scripts/gccnewlib/gccnewlib.spec.in

    r43d3a8e r72d3f610  
    1010Distribution: Linux
    1111Name:         @target_alias@-gcc
     12Summary:      gcc and newlib C Library for @target_alias@.
     13Group:        unsorted
    1214Release:      @Release@
    1315Copyright:    1999 OARCorp
    14 Group:        unsorted
     16
    1517Provides:     @target_alias@-gcc-newlib
    1618Requires:     @target_alias@-binutils
     
    2022
    2123Version:      @gcc_version@newlib@newlib_version@
    22 Summary:      rtems gcc and newlib C Library for target @target_alias@
    2324Source0:        ftp://ftp.gnu.org/pub/gnu/gcc/gcc-@gcc_version@.tar.gz
    2425Source1:        ftp://sourceware.cygnus/com/pub/newlib/newlib-@newlib_version@.tar.gz
     
    5152    ...
    5253
     54%package -n @target_alias@-gcc-newlib
     55Summary:      rtems gcc and newlib C Library for target @target_alias@
     56Group: unsorted
     57
     58%description -n @target_alias@-gcc-newlib
     59RTEMS is an open source operating system for embedded systems.
     60
     61This is gcc and newlib C Library for @target_alias@.
     62
     63Authors:
     64--------
     65    Joel Sherrill (joel@oarcorp.com)
     66    ...
     67
    5368%prep
    54 echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
    55 # untar the sources inside @target_alias@-gcc-newlib -@Version@
     69# untar the sources inside @target_alias@-gcc-newlib
    5670%setup -c -n @target_alias@-gcc-newlib -a 0 -a 1
    5771
     
    5973%patch1 -p0
    6074
    61   # Now link the C library into the source tree
    62   ln -s ../newlib-1.8.2/newlib gcc-@gcc_version@
     75  # Copy the C library into gcc's source tree
     76  ln -s ../newlib-@newlib_version@/newlib gcc-@gcc_version@
     77  test -d build || mkdir build
    6378
    6479%build
    65   test -d build || mkdir build
    6680  cd build
    6781  ../gcc-@gcc_version@/configure --target=@target_alias@ \
     
    8599%install
    86100  cd build
     101  # Bug in gcc-2.95.1: It doesn't build this installation directory
     102  # If it doesn't find it, gcc doesn't install @target_alias@/bin/gcc
     103  ../gcc-@gcc_version@/mkinstalldirs \
     104    $RPM_BUILD_ROOT/opt/rtems/@target_alias@/bin
     105
    87106  make prefix=$RPM_BUILD_ROOT/opt/rtems install
    88107  cd @target_alias@/newlib
     
    96115  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null
    97116  gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null
    98 
    99   rm -f files
    100 
    101   # collect c++ headers
    102   if test -d $RPM_BUILD_ROOT/opt/rtems/include/g++-3; then
    103     find $RPM_BUILD_ROOT/opt/rtems/include/g++-3 \
    104       -type d | \
    105       sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
    106     find $RPM_BUILD_ROOT/opt/rtems/include/g++-3 \
    107       \( -type f -o -type l \) | \
    108       sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
    109   fi
    110 
    111   # collect target gcc-lib
    112   if test -d "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@"; \
    113   then
    114     find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" \
    115       -type d | sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
    116     find "$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" \
    117       \( -type f -o -type l \) \
    118       | sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
    119   fi
    120 
    121   # collect target files
    122   if test -d "$RPM_BUILD_ROOT/opt/rtems/@target_alias@"; \
    123   then
    124     find "$RPM_BUILD_ROOT/opt/rtems/@target_alias@" \
    125       -type d | \
    126       sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> files
    127     find "$RPM_BUILD_ROOT/opt/rtems/@target_alias@" \
    128       \( -type f -o -type l \) | \
    129       sed -e "s,^$RPM_BUILD_ROOT,,g" >> files
    130   fi
    131117
    132118%post
     
    150136  fi
    151137
    152 %files -f build/files
    153 %docdir /opt/rtems/info
     138%files -n @target_alias@-gcc-newlib
     139%dir /opt/rtems/info
    154140%doc /opt/rtems/info/dir
    155141%doc /opt/rtems/info/chill.info*
     
    160146%doc /opt/rtems/info/libm.info*
    161147
    162 %docdir /opt/rtems/man
    163 %docdir /opt/rtems/man/man1
     148%dir /opt/rtems/man
     149%dir /opt/rtems/man/man1
    164150%doc /opt/rtems/man/man1/cccp.1
    165151%doc /opt/rtems/man/man1/@target_alias@-gcc.1
     
    183169
    184170%dir /opt/rtems/lib
    185 /opt/rtems/lib/libiberty*
     171# We use libiberty from binutils
     172# /opt/rtems/lib/libiberty*
    186173%dir /opt/rtems/include
     174/opt/rtems/include/g++-3
    187175
    188176%dir /opt/rtems/lib/gcc-lib
    189 %dir /opt/rtems/lib/gcc-lib/@target_alias@
     177/opt/rtems/lib/gcc-lib/@target_alias@
    190178
     179/opt/rtems/@target_alias@
  • scripts/gdb/Makefile.in

    r43d3a8e r72d3f610  
    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
    103102.SUFFIXES:
    104103$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
    105         cd $(top_srcdir) && $(AUTOMAKE) --foreign gdb/Makefile
    106 
    107 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
     104        cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps gdb/Makefile
     105
     106Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
    108107        cd $(top_builddir) \
    109108          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
     
    137136
    138137distdir: $(DISTFILES)
    139         here=`cd $(top_builddir) && pwd`; \
    140         top_distdir=`cd $(top_distdir) && pwd`; \
    141         distdir=`cd $(distdir) && pwd`; \
    142         cd $(top_srcdir) \
    143           && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign gdb/Makefile
    144138        @for file in $(DISTFILES); do \
    145139          d=$(srcdir); \
    146140          if test -d $$d/$$file; then \
    147             cp -pr $$d/$$file $(distdir)/$$file; \
     141            cp -pr $$/$$file $(distdir)/$$file; \
    148142          else \
    149143            test -f $(distdir)/$$file \
     
    174168all-redirect: all-am
    175169install-strip:
    176         $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
     170        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    177171installdirs:
    178172        $(mkinstalldirs)  $(DESTDIR)$(RPM_SPECSdir)
  • scripts/gdb/gdb.spec.in

    r43d3a8e r72d3f610  
    9292
    9393%files
    94 %docdir /opt/rtems/info
     94%dir /opt/rtems/info
    9595%doc /opt/rtems/info/gdb.info*
    9696%doc /opt/rtems/info/mmalloc.info*
    9797%doc /opt/rtems/info/readline.info*
    9898
    99 %docdir /opt/rtems/man
    100 %docdir /opt/rtems/man/man1
     99%dir /opt/rtems/man
     100%dir /opt/rtems/man/man1
    101101%doc /opt/rtems/man/man1/@target_alias@-gdb.1
    102102
Note: See TracChangeset for help on using the changeset viewer.