Changeset 431c35d in rtems

Timestamp:

10/20/99 19:59:01 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

e171450

Parents:

c429ec80

Message:

Miscellaneous improvements and cleanups committed so I can merge
Ralf's end of day version.

Location:

scripts

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (3 diffs)
• TODO (modified) (1 diff)
• binutils/binutils.spec.in (modified) (2 diffs)
• buildall (deleted)
• configure (modified) (4 diffs)
• configure.in (modified) (3 diffs)
• gccnewlib/gccnewlib.spec.in (modified) (2 diffs)
• gdb/gdb.spec.in (modified) (2 diffs)
• mkbinutils_subpackage_version (modified) (1 diff)
• mkbinutilspec.in (modified) (1 diff)
• mkgccnewlibspec.in (modified) (1 diff)
• mkgdbspec.in (modified) (1 diff)

scripts/Makefile.am

@@ -28 +28 @@
 
 DISTCLEANFILES = setup.cache
+
+CLEANFILES = buildall

scripts/Makefile.in

@@ -85 +85 @@
 
 DISTCLEANFILES = setup.cache
+
+CLEANFILES = buildall
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =  mkbinutilspec mkgccnewlibspec mkgdbspec
+CONFIG_CLEAN_FILES =  buildall mkbinutilspec mkgccnewlibspec mkgdbspec
 SCRIPTS =  $(noinst_SCRIPTS)
 
 DATA =  $(noinst_DATA)
 
-DIST_COMMON =  README Makefile.am Makefile.in TODO aclocal.m4 configure \
-configure.in install-sh missing mkbinutilspec.in mkgccnewlibspec.in \
-mkgdbspec.in mkinstalldirs
+DIST_COMMON =  README Makefile.am Makefile.in TODO aclocal.m4 \
+buildall.in configure configure.in install-sh missing mkbinutilspec.in \
+mkgccnewlibspec.in mkgdbspec.in mkinstalldirs
 
 
@@ -117 +119 @@
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
         cd $(srcdir) && $(AUTOCONF)
+buildall: $(top_builddir)/config.status buildall.in
+        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 mkbinutilspec: $(top_builddir)/config.status mkbinutilspec.in
         cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -306 +310 @@
 
 clean-generic:
+        -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:

scripts/TODO

@@ +1 @@
+#
+#  $Id$
+#
 
+There is plenty left to do on this :)
+
+  + Add GNAT/RTEMS version.

scripts/binutils/binutils.spec.in

@@ -17 +17 @@
 Autoreqprov:    on
 Packager:       corsepiu@faw.uni-ulm.de and joel@OARcorp.com
-Buildroot:      /tmp
+Buildroot:      /opt/tmp
 Prefix:         /opt
 
-Version:        binutils@binutils_version@
+Version:        @binutils_version@
 Summary:        binutils for target @target_alias@
 Source0:        binutils-@binutils_version@.tar.gz
@@ -36 +36 @@
 
 %prep
+echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
 # untar the sources inside @target_alias@-binutils
 %setup -c -n @target_alias@-binutils -a 0

scripts/configure

@@ -914 +914 @@
 
 trap 'rm -fr `echo "Makefile
+buildall
 mkbinutilspec
 mkgccnewlibspec
@@ -920 +921 @@
 gccnewlib/Makefile
 gdb/Makefile
+rtems/Makefile
 " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -1009 +1011 @@
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
+buildall
 mkbinutilspec
 mkgccnewlibspec
@@ -1015 +1018 @@
 gccnewlib/Makefile
 gdb/Makefile
+rtems/Makefile
 "}
 EOF

scripts/configure.in

@@ -1 +1 @@
 AC_INIT(binutils)
-AM_INIT_AUTOMAKE(scripts,19991020-0,no)
+AM_INIT_AUTOMAKE(scripts,19991020-1,no)
 
 test -f ./setup.cache || cp ./setup.def ./setup.cache
@@ -34 +34 @@
 AC_OUTPUT(
 Makefile
+buildall
 mkbinutilspec
 mkgccnewlibspec
@@ -40 +41 @@
 gccnewlib/Makefile
 gdb/Makefile
+rtems/Makefile
 )

scripts/gccnewlib/gccnewlib.spec.in

@@ -19 +19 @@
 Packager:     corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 
-Version:      gcc@gcc_version@newlib@newlib_version@
+Version:      @gcc_version@newlib@newlib_version@
 Summary:      rtems gcc and newlib C Library for target @target_alias@
 Source0:        gcc-@gcc_version@.tar.gz
@@ -39 +39 @@
 
 %prep
+echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
 # untar the sources inside @target_alias@-gcc-newlib -@Version@
 %setup -c -n @target_alias@-gcc-newlib -a 0 -a 1

scripts/gdb/gdb.spec.in

@@ -20 +20 @@
 Packager:     corsepiu@faw.uni-ulm.de and joel@OARcorp.com
 
-Version:      gdb@gdb_version@
+Version:      @gdb_version@
 Summary:      gdb for target @target_alias@
 Source0:        gdb-@gdb_version@.tar.gz
@@ -38 +38 @@
 
 %prep
+echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT}
 # untar the sources inside @target_alias@-gdb
 %setup -c -n @target_alias@-gdb -a 0

scripts/mkbinutils_subpackage_version

@@ -62 +62 @@
 echo "Patch0:           binutils-990901-rtems-19991015.diff"
 echo ""
-echo "Buildroot:    /tmp"
+echo "Buildroot:    /opt/tmp"
 echo "# Patch:"
 echo "%description"

scripts/mkbinutilspec.in

@@ -46 +46 @@
 target_alias=$1
 
-# RPM release number
-rpm_release=0
-
 . ./$CFG
 
 specfile=${dst}/$target_alias-binutils-${binutils_version}.spec
 
-sed -e "s%@Release@%${rpm_release}%g" \
+sed -e "s%@Release@%${binutils_rpm_release}%g" \
     -e "s%@target_alias@%${target_alias}%g" \
     -e "s%@binutils_version@%${binutils_version}%g" \

scripts/mkgccnewlibspec.in

@@ -46 +46 @@
 target_alias=$1
 
-# RPM release number
-rpm_release=0
-
 . ./$CFG
 
 specfile=${dst}/$target_alias-gcc-${gcc_version}-newlib-${newlib_version}.spec
 
-sed -e "s%@Release@%${rpm_release}%g" \
+sed -e "s%@Release@%${gccnewlib_rpm_release}%g" \
     -e "s%@target_alias@%${target_alias}%g" \
     -e "s%@gcc_version@%${gcc_version}%g" \

scripts/mkgdbspec.in

@@ -45 +45 @@
 target_alias=$1
 
-# RPM release number
-rpm_release=0
-
 . ./$CFG
 
 specfile=${dst}/$target_alias-gdb-${gdb_version}.spec
 
-sed -e "s%@Release@%${rpm_release}%g" \
+sed -e "s%@Release@%${gdb_rpm_release}%g" \
     -e "s%@target_alias@%${target_alias}%g" \
     -e "s%@gdb_version@%${gdb_version}%g" \