summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1999-10-20 20:23:18 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1999-10-20 20:23:18 +0000
commit2f23359df0e9d33ef58293240e29d4240649b071 (patch)
tree78e438831008ec1aa64cc48e1faf06542b3543d7 /scripts
parentMoved stuff to rtems subdirectory and made sure the system still (diff)
downloadrtems-2f23359df0e9d33ef58293240e29d4240649b071.tar.bz2
Moved stuff to rtems subdirectory and made sure the system still
functioned.
Diffstat (limited to '')
-rw-r--r--scripts/Makefile.am2
-rw-r--r--scripts/Makefile.in10
-rw-r--r--scripts/binutils/Makefile.in1
-rwxr-xr-xscripts/buildall.in37
-rw-r--r--scripts/configure7
-rw-r--r--scripts/configure.in3
-rw-r--r--scripts/gdb/Makefile.in1
7 files changed, 42 insertions, 19 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1ff0ae8ed1..b4af5ddf99 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = . binutils gccnewlib gdb
+SUBDIRS = . binutils gccnewlib gdb rtems
noinst_SCRIPTS = \
setup \
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 7c95f9021f..c65721ac3c 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -59,6 +59,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
BINUTILSVERS = @BINUTILSVERS@
+BSPVERS = @BSPVERS@
GCCNEWLIBVERS = @GCCNEWLIBVERS@
GDBVERS = @GDBVERS@
MAKEINFO = @MAKEINFO@
@@ -68,7 +69,7 @@ VERSION = @VERSION@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = . binutils gccnewlib gdb
+SUBDIRS = . binutils gccnewlib gdb rtems
noinst_SCRIPTS = setup buildall mkbinutils_subpackage_version mkbinutilspec mkbspspec mkgccnewlibspec mkgdbspec mkrpms mkspec
@@ -88,14 +89,15 @@ DISTCLEANFILES = setup.cache
CLEANFILES = buildall
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = buildall mkbinutilspec mkgccnewlibspec mkgdbspec
+CONFIG_CLEAN_FILES = buildall mkbinutilspec mkgccnewlibspec mkgdbspec \
+mkbspspec
SCRIPTS = $(noinst_SCRIPTS)
DATA = $(noinst_DATA)
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
+mkbspspec.in mkgccnewlibspec.in mkgdbspec.in mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -126,6 +128,8 @@ mkgccnewlibspec: $(top_builddir)/config.status mkgccnewlibspec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
mkgdbspec: $(top_builddir)/config.status mkgdbspec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+mkbspspec: $(top_builddir)/config.status mkbspspec.in
+ cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
diff --git a/scripts/binutils/Makefile.in b/scripts/binutils/Makefile.in
index 80ac5df826..db2758c7d4 100644
--- a/scripts/binutils/Makefile.in
+++ b/scripts/binutils/Makefile.in
@@ -59,6 +59,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
BINUTILSVERS = @BINUTILSVERS@
+BSPVERS = @BSPVERS@
GCCNEWLIBVERS = @GCCNEWLIBVERS@
GDBVERS = @GDBVERS@
MAKEINFO = @MAKEINFO@
diff --git a/scripts/buildall.in b/scripts/buildall.in
index 671aaa0f30..549f4313a9 100755
--- a/scripts/buildall.in
+++ b/scripts/buildall.in
@@ -62,7 +62,7 @@ newlib=${newlib_version}
# also use binutils_rpm_release
buildroot=/opt/tmp
-testing=yes
+testing=no
do_binutils=yes
do_gdb=yes
do_gccnewlib=yes
@@ -124,19 +124,9 @@ do
echo Skipping binutils for ${target}
fi
- if [ ${do_gdb} = yes ] ; then
- # now build gdb
- logfile=log/${target}-gdb
- specfile=${dst}/${target}-gdb-${gdb}.spec
- echo "rpm -ba ${specfile} >${logfile} 2>&1"
- if [ ${testing} = no ] ; then
- rpm -ba ${specfile} >${logfile} 2>&1
- fi
- ${ECHO} rm -rf ${dst}/../BUILD/${target}-gdb*
- ${ECHO} rm -rf ${buildroot}/opt
- else
- echo Skipping gdb for ${target}
- fi
+ #
+ # build gcc/newlib
+ #
if [ ${do_gccnewlib} = yes ] ; then
# now build gcc/newlib
@@ -165,6 +155,25 @@ do
else
echo Skipping gcc/newlib for ${target}
fi
+
+ #
+ # build gdb
+ #
+
+ if [ ${do_gdb} = yes ] ; then
+ # now build gdb
+ logfile=log/${target}-gdb
+ specfile=${dst}/${target}-gdb-${gdb}.spec
+ echo "rpm -ba ${specfile} >${logfile} 2>&1"
+ if [ ${testing} = no ] ; then
+ rpm -ba ${specfile} >${logfile} 2>&1
+ fi
+ ${ECHO} rm -rf ${dst}/../BUILD/${target}-gdb*
+ ${ECHO} rm -rf ${buildroot}/opt
+ else
+ echo Skipping gdb for ${target}
+ fi
+
done
# Now we are done
diff --git a/scripts/configure b/scripts/configure
index e917aa451d..da668e4913 100644
--- a/scripts/configure
+++ b/scripts/configure
@@ -692,7 +692,7 @@ fi
PACKAGE=scripts
-VERSION=19991020-0
+VERSION=19991020-1
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -798,6 +798,8 @@ BINUTILSVERS="binutils-${binutils_version}"
GDBVERS="gdb-${gdb_version}"
+BSPVERS="RTEMS-no_version_yet"
+
trap '' 1 2 15
cat > confcache <<\EOF
@@ -917,6 +919,7 @@ buildall
mkbinutilspec
mkgccnewlibspec
mkgdbspec
+mkbspspec
binutils/Makefile
gccnewlib/Makefile
gdb/Makefile
@@ -968,6 +971,7 @@ s%@RPM_SPECSdir@%$RPM_SPECSdir%g
s%@GCCNEWLIBVERS@%$GCCNEWLIBVERS%g
s%@BINUTILSVERS@%$BINUTILSVERS%g
s%@GDBVERS@%$GDBVERS%g
+s%@BSPVERS@%$BSPVERS%g
CEOF
EOF
@@ -1014,6 +1018,7 @@ buildall
mkbinutilspec
mkgccnewlibspec
mkgdbspec
+mkbspspec
binutils/Makefile
gccnewlib/Makefile
gdb/Makefile
diff --git a/scripts/configure.in b/scripts/configure.in
index 7ceff551c5..aaa3f10221 100644
--- a/scripts/configure.in
+++ b/scripts/configure.in
@@ -30,6 +30,8 @@ BINUTILSVERS="binutils-${binutils_version}"
AC_SUBST(BINUTILSVERS)
GDBVERS="gdb-${gdb_version}"
AC_SUBST(GDBVERS)
+BSPVERS="RTEMS-no_version_yet"
+AC_SUBST(BSPVERS)
AC_OUTPUT(
Makefile
@@ -37,6 +39,7 @@ buildall
mkbinutilspec
mkgccnewlibspec
mkgdbspec
+mkbspspec
binutils/Makefile
gccnewlib/Makefile
gdb/Makefile
diff --git a/scripts/gdb/Makefile.in b/scripts/gdb/Makefile.in
index 0da6ac8bcd..a3dbc7ee22 100644
--- a/scripts/gdb/Makefile.in
+++ b/scripts/gdb/Makefile.in
@@ -59,6 +59,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
BINUTILSVERS = @BINUTILSVERS@
+BSPVERS = @BSPVERS@
GCCNEWLIBVERS = @GCCNEWLIBVERS@
GDBVERS = @GDBVERS@
MAKEINFO = @MAKEINFO@