From 0610a988e3f1cbd7fcec1f3b9cc76f94f408e8b2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 26 Jan 2000 20:50:23 +0000 Subject: First attempt at debugging. --- scripts-ada/Makefile.am | 2 +- scripts-ada/binutils/Makefile.am | 36 ------- scripts-ada/binutils/binutils.spec.in | 154 +++++++++++++++--------------- scripts-ada/buildall.in | 8 +- scripts-ada/gdb/Makefile.am | 36 ------- scripts-ada/gdb/gdb.spec.in | 64 ++++++------- scripts-ada/gnatnewlib/Makefile.am | 36 ------- scripts-ada/gnatnewlib/gnatnewlib.spec.in | 122 +++++++++++------------ scripts-ada/mkbinutilspec.in | 4 +- scripts-ada/mkbspspec.in | 2 +- scripts-ada/mkgdbspec.in | 10 +- scripts-ada/mkgnatnewlibspec.in | 6 +- 12 files changed, 187 insertions(+), 293 deletions(-) (limited to 'scripts-ada') diff --git a/scripts-ada/Makefile.am b/scripts-ada/Makefile.am index 82d4c9e667..30fd57fad3 100644 --- a/scripts-ada/Makefile.am +++ b/scripts-ada/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = . binutils gnatnewlib gdb rtems +SUBDIRS = . binutils gnatnewlib gdb noinst_SCRIPTS = \ setup \ diff --git a/scripts-ada/binutils/Makefile.am b/scripts-ada/binutils/Makefile.am index 83556b88b5..fbedcd1d21 100644 --- a/scripts-ada/binutils/Makefile.am +++ b/scripts-ada/binutils/Makefile.am @@ -7,33 +7,6 @@ MKBINUTILSSPEC = $(SHELL) $(top_builddir)/mkbinutilspec MKBINUTILSSPEC_DEPS = \ $(top_builddir)/mkbinutilspec binutils.spec.in $(top_builddir)/setup.cache -hppa1.1-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems - -i386-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems - -i960-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems - -m68k-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems - -m68k-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself - -mips64orion-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems - -powerpc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems - -sh-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems - -sh-rtemself-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) - $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself - sparc-rtems-$(BINUTILSVERS).spec: $(MKBINUTILSSPEC_DEPS) $(MKBINUTILSSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems @@ -41,15 +14,6 @@ TEMPLATES = \ binutils.spec.in RPM_SPECS_DATA = \ -hppa1.1-rtems-$(BINUTILSVERS).spec \ -i386-rtems-$(BINUTILSVERS).spec \ -i960-rtems-$(BINUTILSVERS).spec \ -m68k-rtems-$(BINUTILSVERS).spec \ -m68k-rtemself-$(BINUTILSVERS).spec \ -mips64orion-rtems-$(BINUTILSVERS).spec \ -powerpc-rtems-$(BINUTILSVERS).spec \ -sh-rtems-$(BINUTILSVERS).spec \ -sh-rtemself-$(BINUTILSVERS).spec \ sparc-rtems-$(BINUTILSVERS).spec noinst_DATA = \ diff --git a/scripts-ada/binutils/binutils.spec.in b/scripts-ada/binutils/binutils.spec.in index 2795d11a09..9fffbd206e 100644 --- a/scripts-ada/binutils/binutils.spec.in +++ b/scripts-ada/binutils/binutils.spec.in @@ -8,13 +8,13 @@ Vendor: OAR Corporation Distribution: Linux -Name: @target_alias@-binutils-collection +Name: @target_alias@-gnat-binutils-collection Summary: binutils for target @target_alias@ Group: rtems Release: @Release@ Copyright: 1999 OARCorp -Provides: rtems-base-binutils @target_alias@-binutils +Provides: rtems-base-gnat-binutils @target_alias@-gnat-binutils Autoreqprov: on Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com @@ -42,22 +42,22 @@ RTEMS is an open source operating system for embedded systems. This is binutils sources with patches for RTEMS. -%package -n rtems-base-binutils +%package -n rtems-base-gnat-binutils Summary: base package for rtems binutils Group: rtems -%description -n rtems-base-binutils +%description -n rtems-base-gnat-binutils RTEMS is an open source operating system for embedded systems. This is the base for binutils regardless of target CPU. -%package -n @target_alias@-binutils +%package -n @target_alias@-gnat-binutils Summary: rtems binutils for @target_alias@ Group: rtems -Requires: rtems-base-binutils +Requires: rtems-base-gnat-binutils -%description -n @target_alias@-binutils +%description -n @target_alias@-gnat-binutils RTEMS is an open source operating system for embedded systems. @@ -69,8 +69,8 @@ Authors: ... %prep -# untar the sources inside @target_alias@-binutils -%setup -c -n @target_alias@-binutils -a 0 +# untar the sources inside @target_alias@-gnat-binutils +%setup -c -n @target_alias@-gnat-binutils -a 0 %patch0 -p0 test -d build || mkdir build @@ -78,28 +78,28 @@ Authors: %build cd build ../binutils-@binutils_version@/configure --target=@target_alias@ \ - --verbose --prefix=/opt/rtems + --verbose --prefix=/opt/gnatrtems make all make info %install cd build - make prefix=$RPM_BUILD_ROOT/opt/rtems install - make prefix=$RPM_BUILD_ROOT/opt/rtems install-info + make prefix=$RPM_BUILD_ROOT/opt/gnatrtems install + make prefix=$RPM_BUILD_ROOT/opt/gnatrtems install-info # A bug in binutils: binutils does not install share/locale # however it uses it ../binutils-@binutils_version@/mkinstalldirs \ - $RPM_BUILD_ROOT/opt/rtems/share/locale + $RPM_BUILD_ROOT/opt/gnatrtems/share/locale # gzip info files - gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null - gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/gnatrtems/info/*.info 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/gnatrtems/info/*.info-? 2>/dev/null - if test -f $RPM_BUILD_ROOT/opt/rtems/info/configure.info.gz; + if test -f $RPM_BUILD_ROOT/opt/gnatrtems/info/configure.info.gz; then # These are only present in binutils >= 2.9.5 - find $RPM_BUILD_ROOT/opt/rtems/info -name 'configure.*' | \ + find $RPM_BUILD_ROOT/opt/gnatrtems/info -name 'configure.*' | \ sed -e "s,^$RPM_BUILD_ROOT,,g" > ../files else touch ../files @@ -125,63 +125,63 @@ Authors: done fi -%files -n rtems-base-binutils -f files -%dir /opt/rtems/info -%doc /opt/rtems/info/dir -%doc /opt/rtems/info/as.info.gz -%doc /opt/rtems/info/as.info-?.gz -%doc /opt/rtems/info/bfd.info.gz -%doc /opt/rtems/info/bfd.info-?.gz -%doc /opt/rtems/info/binutils.info.gz -%doc /opt/rtems/info/binutils.info-?.gz -%doc /opt/rtems/info/ld.info.gz -%doc /opt/rtems/info/ld.info-?.gz -%doc /opt/rtems/info/gasp.info.gz -%doc /opt/rtems/info/standards.info.gz - -%dir /opt/rtems/man -%dir /opt/rtems/man/man1 - -%dir /opt/rtems/include -/opt/rtems/include/bfd.h -/opt/rtems/include/ansidecl.h -/opt/rtems/include/bfdlink.h - -%dir /opt/rtems/lib -/opt/rtems/lib/libbfd* -/opt/rtems/lib/libiberty* -/opt/rtems/lib/libopcodes* - -%dir /opt/rtems/share -%dir /opt/rtems/share/locale - -%files -n @target_alias@-binutils -%doc /opt/rtems/man/man1/@target_alias@-*.1 - -%dir /opt/rtems/bin -/opt/rtems/bin/@target_alias@-addr2line@exe_ext@ -/opt/rtems/bin/@target_alias@-ar@exe_ext@ -/opt/rtems/bin/@target_alias@-as@exe_ext@ -/opt/rtems/bin/@target_alias@-c++filt@exe_ext@ -/opt/rtems/bin/@target_alias@-gasp@exe_ext@ -/opt/rtems/bin/@target_alias@-ld@exe_ext@ -/opt/rtems/bin/@target_alias@-nm@exe_ext@ -/opt/rtems/bin/@target_alias@-objcopy@exe_ext@ -/opt/rtems/bin/@target_alias@-objdump@exe_ext@ -/opt/rtems/bin/@target_alias@-ranlib@exe_ext@ -/opt/rtems/bin/@target_alias@-readelf@exe_ext@ -/opt/rtems/bin/@target_alias@-size@exe_ext@ -/opt/rtems/bin/@target_alias@-strings@exe_ext@ -/opt/rtems/bin/@target_alias@-strip@exe_ext@ - -%dir /opt/rtems/@target_alias@ -%dir /opt/rtems/@target_alias@/bin -/opt/rtems/@target_alias@/bin/ar@exe_ext@ -/opt/rtems/@target_alias@/bin/as@exe_ext@ -/opt/rtems/@target_alias@/bin/ld@exe_ext@ -/opt/rtems/@target_alias@/bin/nm@exe_ext@ -/opt/rtems/@target_alias@/bin/ranlib@exe_ext@ -/opt/rtems/@target_alias@/bin/strip@exe_ext@ - -%dir /opt/rtems/@target_alias@/lib -/opt/rtems/@target_alias@/lib/ldscripts +%files -n rtems-base-gnat-binutils -f files +%dir /opt/gnatrtems/info +%doc /opt/gnatrtems/info/dir +%doc /opt/gnatrtems/info/as.info.gz +%doc /opt/gnatrtems/info/as.info-?.gz +%doc /opt/gnatrtems/info/bfd.info.gz +%doc /opt/gnatrtems/info/bfd.info-?.gz +%doc /opt/gnatrtems/info/binutils.info.gz +%doc /opt/gnatrtems/info/binutils.info-?.gz +%doc /opt/gnatrtems/info/ld.info.gz +%doc /opt/gnatrtems/info/ld.info-?.gz +%doc /opt/gnatrtems/info/gasp.info.gz +%doc /opt/gnatrtems/info/standards.info.gz + +%dir /opt/gnatrtems/man +%dir /opt/gnatrtems/man/man1 + +%dir /opt/gnatrtems/include +/opt/gnatrtems/include/bfd.h +/opt/gnatrtems/include/ansidecl.h +/opt/gnatrtems/include/bfdlink.h + +%dir /opt/gnatrtems/lib +/opt/gnatrtems/lib/libbfd* +/opt/gnatrtems/lib/libiberty* +/opt/gnatrtems/lib/libopcodes* + +%dir /opt/gnatrtems/share +%dir /opt/gnatrtems/share/locale + +%files -n @target_alias@-gnat-binutils +%doc /opt/gnatrtems/man/man1/@target_alias@-*.1 + +%dir /opt/gnatrtems/bin +/opt/gnatrtems/bin/@target_alias@-addr2line@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-ar@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-as@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-c++filt@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-gasp@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-ld@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-nm@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-objcopy@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-objdump@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-ranlib@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-readelf@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-size@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-strings@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-strip@exe_ext@ + +%dir /opt/gnatrtems/@target_alias@ +%dir /opt/gnatrtems/@target_alias@/bin +/opt/gnatrtems/@target_alias@/bin/ar@exe_ext@ +/opt/gnatrtems/@target_alias@/bin/as@exe_ext@ +/opt/gnatrtems/@target_alias@/bin/ld@exe_ext@ +/opt/gnatrtems/@target_alias@/bin/nm@exe_ext@ +/opt/gnatrtems/@target_alias@/bin/ranlib@exe_ext@ +/opt/gnatrtems/@target_alias@/bin/strip@exe_ext@ + +%dir /opt/gnatrtems/@target_alias@/lib +/opt/gnatrtems/@target_alias@/lib/ldscripts diff --git a/scripts-ada/buildall.in b/scripts-ada/buildall.in index 845c493caa..1e90d481ae 100644 --- a/scripts-ada/buildall.in +++ b/scripts-ada/buildall.in @@ -122,7 +122,7 @@ do rpm -ba ${specfile} >${logfile} 2>&1 fi ${ECHO} rm -rf ${dst}/../BUILD/${target}-binutils* - ${ECHO} rm -rf ${buildroot}/opt/rtems + ${ECHO} rm -rf ${buildroot}/opt/gnatrtems else echo Skipping binutils for ${target} fi @@ -151,12 +151,12 @@ do rpm -ba ${specfile} >${logfile} 2>&1 fi ${ECHO} rm -rf ${dst}/../BUILD/${target}-gcc* - ${ECHO} rm -rf ${buildroot}/opt/rtems + ${ECHO} rm -rf ${buildroot}/opt/gnatrtems echo uninstalling binutils for ${target} if [ ${testing} = no ] ; then rpm -e `rpm -qa | grep rtems` - rm -rf /opt/rtems/* + rm -rf /opt/gnatrtems/* fi else echo Skipping gcc/newlib for ${target} @@ -175,7 +175,7 @@ do rpm -ba ${specfile} >${logfile} 2>&1 fi ${ECHO} rm -rf ${dst}/../BUILD/${target}-gdb* - ${ECHO} rm -rf ${buildroot}/opt/rtems + ${ECHO} rm -rf ${buildroot}/opt/gnatrtems else echo Skipping gdb for ${target} fi diff --git a/scripts-ada/gdb/Makefile.am b/scripts-ada/gdb/Makefile.am index 74782485cb..5ef5cbf3ff 100644 --- a/scripts-ada/gdb/Makefile.am +++ b/scripts-ada/gdb/Makefile.am @@ -5,33 +5,6 @@ MKGDBSPEC = $(SHELL) $(top_builddir)/mkgdbspec MKGDBSPEC_DEPS = \ $(top_builddir)/mkgdbspec gdb.spec.in $(top_builddir)/setup.cache -hppa1.1-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems - -i386-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems - -i960-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems - -m68k-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems - -m68k-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself - -mips64orion-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems - -powerpc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems - -sh-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems - -sh-rtemself-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) - $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself - sparc-rtems-$(GDBVERS).spec: $(MKGDBSPEC_DEPS) $(MKGDBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems @@ -39,15 +12,6 @@ TEMPLATES = \ gdb.spec.in RPM_SPECS_DATA = \ -hppa1.1-rtems-$(GDBVERS).spec \ -i386-rtems-$(GDBVERS).spec \ -i960-rtems-$(GDBVERS).spec \ -m68k-rtems-$(GDBVERS).spec \ -m68k-rtemself-$(GDBVERS).spec \ -mips64orion-rtems-$(GDBVERS).spec \ -powerpc-rtems-$(GDBVERS).spec \ -sh-rtems-$(GDBVERS).spec \ -sh-rtemself-$(GDBVERS).spec \ sparc-rtems-$(GDBVERS).spec noinst_DATA = \ diff --git a/scripts-ada/gdb/gdb.spec.in b/scripts-ada/gdb/gdb.spec.in index 0e8c005556..d0de95b4c5 100644 --- a/scripts-ada/gdb/gdb.spec.in +++ b/scripts-ada/gdb/gdb.spec.in @@ -10,11 +10,11 @@ Vendor: OAR Corporation Distribution: Linux -Name: @target_alias@-gdb-collection +Name: @target_alias@-gnat-gdb-collection Release: @Release@ Copyright: 1999 OARCorp Group: rtems -Provides: rtems-base-gdb @target_alias@-gdb +Provides: rtems-base-gnat-gdb @target_alias@-gnat-gdb Autoreqprov: on Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com @@ -42,22 +42,22 @@ RTEMS is an open source operating system for embedded systems. This is the GNU gdb for RTEMS targetting @target_alias@. -%package -n rtems-base-gdb +%package -n rtems-base-gnat-gdb Summary: base package for rtems gdb Group: rtems -%description -n rtems-base-gdb +%description -n rtems-base-gnat-gdb RTEMS is an open source operating system for embedded systems. This is the base for gdb regardless of target CPU. -%package -n @target_alias@-gdb +%package -n @target_alias@-gnat-gdb Summary: rtems gdb for @target_alias@ Group: rtems -Requires: rtems-base-gdb +Requires: rtems-base-gnat-gdb -%description -n @target_alias@-gdb +%description -n @target_alias@-gnat-gdb RTEMS is an open source operating system for embedded systems. @@ -71,8 +71,8 @@ Authors: %prep echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT} -# untar the sources inside @target_alias@-gdb -%setup -c -n @target_alias@-gdb -a 0 +# untar the sources inside @target_alias@-gnat-gdb +%setup -c -n @target_alias@-gnat-gdb -a 0 %patch0 -p0 @@ -80,20 +80,20 @@ echo RPM_BUILD_ROOT=${RPM_BUILD_ROOT} test -d build || mkdir build cd build ../gdb-@gdb_version@/configure --target=@target_alias@ \ - --verbose --prefix=/opt/rtems @extra_configure_arguments@ + --verbose --prefix=/opt/gnatrtems @extra_configure_arguments@ make all make info %install cd build - make prefix=$RPM_BUILD_ROOT/opt/rtems install - make prefix=$RPM_BUILD_ROOT/opt/rtems install-info + make prefix=$RPM_BUILD_ROOT/opt/gnatrtems install + make prefix=$RPM_BUILD_ROOT/opt/gnatrtems install-info # gzip info files - gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null - gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null - gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/gnatrtems/info/*.info 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/gnatrtems/info/*.info-? 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/gnatrtems/info/*.info-?? 2>/dev/null %post if test -d $RPM_INSTALL_PREFIX/rtems/info; @@ -115,30 +115,30 @@ test -d build || mkdir build done fi -%files -n rtems-base-gdb +%files -n rtems-base-gnat-gdb -%dir /opt/rtems/info -%doc /opt/rtems/info/gdb.info* -%doc /opt/rtems/info/mmalloc.info* -%doc /opt/rtems/info/readline.info* +%dir /opt/gnatrtems/info +%doc /opt/gnatrtems/info/gdb.info* +%doc /opt/gnatrtems/info/mmalloc.info* +%doc /opt/gnatrtems/info/readline.info* -%dir /opt/rtems/man -%dir /opt/rtems/man/man1 +%dir /opt/gnatrtems/man +%dir /opt/gnatrtems/man/man1 -%dir /opt/rtems/include +%dir /opt/gnatrtems/include # We install libbfd from binutils -# /opt/rtems/include/bfd.h -# /opt/rtems/include/bfdlink.h +# /opt/gnatrtems/include/bfd.h +# /opt/gnatrtems/include/bfdlink.h -%dir /opt/rtems/lib +%dir /opt/gnatrtems/lib # We install libbfd from binutils -# /opt/rtems/lib/libbfd* +# /opt/gnatrtems/lib/libbfd* # We use libiberty from gcc -# /opt/rtems/lib/libiberty* +# /opt/gnatrtems/lib/libiberty* -%files -n @target_alias@-gdb -%doc /opt/rtems/man/man1/@target_alias@-gdb.1 +%files -n @target_alias@-gnat-gdb +%doc /opt/gnatrtems/man/man1/@target_alias@-gnat-gdb.1 -%dir /opt/rtems/bin -/opt/rtems/bin/@target_alias@-gdb@exe_ext@ +%dir /opt/gnatrtems/bin +/opt/gnatrtems/bin/@target_alias@-gdb@exe_ext@ diff --git a/scripts-ada/gnatnewlib/Makefile.am b/scripts-ada/gnatnewlib/Makefile.am index 60d7f0cc93..9d7777ab99 100644 --- a/scripts-ada/gnatnewlib/Makefile.am +++ b/scripts-ada/gnatnewlib/Makefile.am @@ -7,33 +7,6 @@ MKGNATNEWLIBSPEC = $(SHELL) $(top_builddir)/mkgnatnewlibspec MKGNATNEWLIBSPEC_DEPS = \ $(top_builddir)/mkgnatnewlibspec gnatnewlib.spec.in $(top_builddir)/setup.cache -hppa1.1-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . hppa1.1-rtems - -i386-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i386-rtems - -i960-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . i960-rtems - -m68k-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtems - -m68k-rtemself-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . m68k-rtemself - -mips64orion-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . mips64orion-rtems - -powerpc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . powerpc-rtems - -sh-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtems - -sh-rtemself-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) - $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sh-rtemself - sparc-rtems-$(GNATNEWLIBVERS).spec: $(MKGNATNEWLIBSPEC_DEPS) $(MKGNATNEWLIBSPEC) -cfg $(top_builddir)/setup.cache -o . sparc-rtems @@ -41,15 +14,6 @@ TEMPLATES = \ gnatnewlib.spec.in RPM_SPECS_DATA = \ -hppa1.1-rtems-$(GNATNEWLIBVERS).spec \ -i386-rtems-$(GNATNEWLIBVERS).spec \ -i960-rtems-$(GNATNEWLIBVERS).spec \ -m68k-rtems-$(GNATNEWLIBVERS).spec \ -m68k-rtemself-$(GNATNEWLIBVERS).spec \ -mips64orion-rtems-$(GNATNEWLIBVERS).spec \ -powerpc-rtems-$(GNATNEWLIBVERS).spec \ -sh-rtems-$(GNATNEWLIBVERS).spec \ -sh-rtemself-$(GNATNEWLIBVERS).spec \ sparc-rtems-$(GNATNEWLIBVERS).spec noinst_DATA = \ diff --git a/scripts-ada/gnatnewlib/gnatnewlib.spec.in b/scripts-ada/gnatnewlib/gnatnewlib.spec.in index dae219949f..c82740befe 100644 --- a/scripts-ada/gnatnewlib/gnatnewlib.spec.in +++ b/scripts-ada/gnatnewlib/gnatnewlib.spec.in @@ -8,7 +8,7 @@ Vendor: OAR Corporation Distribution: Linux -Name: @target_alias@-gnat-gcc-newlib +Name: @target_alias@-gnat-newlib Summary: gnat, gcc, and newlib C Library for @target_alias@. Group: rtems Release: @Release@ @@ -100,7 +100,7 @@ This is gnat, gcc, and newlib C Library for @target_alias@. cd build ../gcc-@gcc_version@/configure --target=@target_alias@ \ --with-gnu-as --with-gnu-ld --with-newlib --verbose \ - --prefix=/opt/rtems + --prefix=/opt/gnatrtems # for now we are building all the languages # '--enable-languages=c,c++' @@ -121,27 +121,27 @@ This is gnat, gcc, and newlib C Library for @target_alias@. # Bug in gcc-2.95.1: It doesn't build this installation directory # If it doesn't find it, gcc doesn't install @target_alias@/bin/gcc ../gcc-@gcc_version@/mkinstalldirs \ - $RPM_BUILD_ROOT/opt/rtems/@target_alias@/bin + $RPM_BUILD_ROOT/opt/gnatrtems/@target_alias@/bin - make prefix=$RPM_BUILD_ROOT/opt/rtems install + make prefix=$RPM_BUILD_ROOT/opt/gnatrtems install cd @target_alias@/newlib - make prefix=$RPM_BUILD_ROOT/opt/rtems install-info + make prefix=$RPM_BUILD_ROOT/opt/gnatrtems install-info # cd back to build/ cd ../.. # gzip info files - gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info 2>/dev/null - gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-? 2>/dev/null - gzip -f $RPM_BUILD_ROOT/opt/rtems/info/*.info-?? 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/gnatrtems/info/*.info 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/gnatrtems/info/*.info-? 2>/dev/null + gzip -f $RPM_BUILD_ROOT/opt/gnatrtems/info/*.info-?? 2>/dev/null rm -f dirs ; - echo "%dir /opt/rtems/lib" >> dirs ; - echo "%dir /opt/rtems/lib/gcc-lib" >> dirs ; - echo "%dir /opt/rtems/lib/gcc-lib/@target_alias@" >> dirs ; + echo "%dir /opt/gnatrtems/lib" >> dirs ; + echo "%dir /opt/gnatrtems/lib/gcc-lib" >> dirs ; + echo "%dir /opt/gnatrtems/lib/gcc-lib/@target_alias@" >> dirs ; # Collect multilib subdirectories - TGTDIR="$RPM_BUILD_ROOT/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@" + TGTDIR="$RPM_BUILD_ROOT/opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@" find $TGTDIR \ \( -type d -a ! -path "$TGTDIR/include*" \) -print | \ sed -e "s,^$RPM_BUILD_ROOT,%dir ,g" >> dirs @@ -168,33 +168,33 @@ This is gnat, gcc, and newlib C Library for @target_alias@. done %files -n @target_alias@-gcc -f build/files.gcc -%dir /opt/rtems/info -%doc /opt/rtems/info/dir -%doc /opt/rtems/info/cpp.info* -%doc /opt/rtems/info/gcc.info* -%doc /opt/rtems/info/libc.info* -%doc /opt/rtems/info/libm.info* - -%dir /opt/rtems/man -%dir /opt/rtems/man/man1 -%doc /opt/rtems/man/man1/cccp.1 -%doc /opt/rtems/man/man1/@target_alias@-gcc.1 -%doc /opt/rtems/man/man1/@target_alias@-g++.1 - -%dir /opt/rtems/bin -/opt/rtems/bin/cpp@exe_ext@ -/opt/rtems/bin/gcov@exe_ext@ -/opt/rtems/bin/@target_alias@-c++@exe_ext@ -/opt/rtems/bin/@target_alias@-g++@exe_ext@ -/opt/rtems/bin/@target_alias@-gcc@exe_ext@ -/opt/rtems/bin/@target_alias@-protoize@exe_ext@ -/opt/rtems/bin/@target_alias@-unprotoize@exe_ext@ - -%dir /opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include - -%dir /opt/rtems/include -/opt/rtems/include/g++-3 -/opt/rtems/@target_alias@ +%dir /opt/gnatrtems/info +%doc /opt/gnatrtems/info/dir +%doc /opt/gnatrtems/info/cpp.info* +%doc /opt/gnatrtems/info/gcc.info* +%doc /opt/gnatrtems/info/libc.info* +%doc /opt/gnatrtems/info/libm.info* + +%dir /opt/gnatrtems/man +%dir /opt/gnatrtems/man/man1 +%doc /opt/gnatrtems/man/man1/cccp.1 +%doc /opt/gnatrtems/man/man1/@target_alias@-gcc.1 +%doc /opt/gnatrtems/man/man1/@target_alias@-g++.1 + +%dir /opt/gnatrtems/bin +/opt/gnatrtems/bin/cpp@exe_ext@ +/opt/gnatrtems/bin/gcov@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-c++@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-g++@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-gcc@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-protoize@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-unprotoize@exe_ext@ + +%dir /opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@/include + +%dir /opt/gnatrtems/include +/opt/gnatrtems/include/g++-3 +/opt/gnatrtems/@target_alias@ %post -n @target_alias@-gcc if test -d $RPM_INSTALL_PREFIX/rtems/info; @@ -218,12 +218,12 @@ This is gnat, gcc, and newlib C Library for @target_alias@. %files -n @target_alias@-chill -f build/files.chill -%dir /opt/rtems/bin -/opt/rtems/bin/@target_alias@-chill@exe_ext@ +%dir /opt/gnatrtems/bin +/opt/gnatrtems/bin/@target_alias@-chill@exe_ext@ -%dir /opt/rtems/info -%doc /opt/rtems/info/dir -%doc /opt/rtems/info/chill.info* +%dir /opt/gnatrtems/info +%doc /opt/gnatrtems/info/dir +%doc /opt/gnatrtems/info/chill.info* %post -n @target_alias@-chill if test -d $RPM_INSTALL_PREFIX/rtems/info; @@ -247,28 +247,28 @@ This is gnat, gcc, and newlib C Library for @target_alias@. %files -n @target_alias@-gcj -f build/files.gcj -%dir /opt/rtems/bin -/opt/rtems/bin/jcf-dump@exe_ext@ -/opt/rtems/bin/jv-scan@exe_ext@ -/opt/rtems/bin/gcjh@exe_ext@ -/opt/rtems/bin/@target_alias@-gcj@exe_ext@ +%dir /opt/gnatrtems/bin +/opt/gnatrtems/bin/jcf-dump@exe_ext@ +/opt/gnatrtems/bin/jv-scan@exe_ext@ +/opt/gnatrtems/bin/gcjh@exe_ext@ +/opt/gnatrtems/bin/@target_alias@-gcj@exe_ext@ -/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@ -/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@ +/opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@/jc1@exe_ext@ +/opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@/jvgenmain@exe_ext@ %files -n @target_alias@-g77 -f build/files.g77 -%dir /opt/rtems/bin -/opt/rtems/bin/@target_alias@-g77@exe_ext@ +%dir /opt/gnatrtems/bin +/opt/gnatrtems/bin/@target_alias@-g77@exe_ext@ -%dir /opt/rtems/info -%doc /opt/rtems/info/g77.info* +%dir /opt/gnatrtems/info +%doc /opt/gnatrtems/info/g77.info* -%dir /opt/rtems/man -%dir /opt/rtems/man/man1 -%doc /opt/rtems/man/man1/@target_alias@-g77.1 +%dir /opt/gnatrtems/man +%dir /opt/gnatrtems/man/man1 +%doc /opt/gnatrtems/man/man1/@target_alias@-g77.1 -/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@ +/opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@/f771@exe_ext@ %post -n @target_alias@-g77 if test -d $RPM_INSTALL_PREFIX/rtems/info; @@ -292,5 +292,5 @@ This is gnat, gcc, and newlib C Library for @target_alias@. %files -n @target_alias@-objc -f build/files.objc -/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@ -/opt/rtems/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc +/opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@/cc1obj@exe_ext@ +/opt/gnatrtems/lib/gcc-lib/@target_alias@/@gcc_version@/include/objc diff --git a/scripts-ada/mkbinutilspec.in b/scripts-ada/mkbinutilspec.in index d2adf3bd56..5275f28f7b 100644 --- a/scripts-ada/mkbinutilspec.in +++ b/scripts-ada/mkbinutilspec.in @@ -48,13 +48,13 @@ target_alias=$1 . ./$CFG -specfile=${dst}/$target_alias-binutils-${binutils_version}.spec +specfile=${dst}/${target_alias}-gnat-binutils-${binutils_version}.spec sed -e "s%@Release@%${binutils_rpm_release}%g" \ -e "s%@rpm_build_root@%${rpm_build_root}%g" \ -e "s%@target_alias@%${target_alias}%g" \ -e "s%@binutils_version@%${binutils_version}%g" \ - -e "s%@binutils_patch_version@%${binutils_patch_version}%g" \ + -e "s%@binutils_patch_version@%gnat-${binutils_patch_version}%g" \ -e "s%@exe_ext@%${exe_ext}%g" \ < ${RTEMS_DIR}/binutils/binutils.spec.in \ > ${specfile} diff --git a/scripts-ada/mkbspspec.in b/scripts-ada/mkbspspec.in index 02edf02dc8..7b79e0be47 100644 --- a/scripts-ada/mkbspspec.in +++ b/scripts-ada/mkbspspec.in @@ -48,7 +48,7 @@ bsp=$2 . ./$CFG -specfile=${dst}/$target_alias-$bsp-${rtems_version}.spec +specfile=${dst}/${target_alias}-gnat-${bsp}-${rtems_version}.spec sed -e "s%@Release@%${rtems_rpm_release}%g" \ -e "s%@bsp@%${bsp}%g" \ diff --git a/scripts-ada/mkgdbspec.in b/scripts-ada/mkgdbspec.in index 1b38b83a4c..0d8a197110 100644 --- a/scripts-ada/mkgdbspec.in +++ b/scripts-ada/mkgdbspec.in @@ -48,7 +48,7 @@ target_alias=$1 . ./$CFG -specfile=${dst}/$target_alias-gdb-${gdb_version}.spec +specfile=${dst}/${target_alias}-gnat-gdb-${gdb_version}.spec case ${target_alias} in powerpc*) @@ -68,7 +68,7 @@ sed -e "s%@Release@%${gdb_rpm_release}%g" \ -e "s%@rpm_build_root@%${rpm_build_root}%g" \ -e "s%@target_alias@%${target_alias}%g" \ -e "s%@gdb_version@%${gdb_version}%g" \ - -e "s%@gdb_patch_version@%${gdb_patch_version}%g" \ + -e "s%@gdb_patch_version@%gnat-${gdb_patch_version}%g" \ -e "s%@extra_configure_arguments@%${extra_configure_arguments}%g" \ -e "s%@exe_ext@%${exe_ext}%g" \ < ${RTEMS_DIR}/gdb/gdb.spec.in \ @@ -76,11 +76,11 @@ sed -e "s%@Release@%${gdb_rpm_release}%g" \ case ${target_alias} in powerpc*) - echo "/opt/rtems/bin/${target_alias}-run${exe_ext}" + echo "/opt/gnatrtems/bin/${target_alias}-run${exe_ext}" ;; sparc*) - echo "/opt/rtems/bin/${target_alias}-run${exe_ext}" - echo "/opt/rtems/bin/${target_alias}-sis${exe_ext}" + echo "/opt/gnatrtems/bin/${target_alias}-run${exe_ext}" + echo "/opt/gnatrtems/bin/${target_alias}-sis${exe_ext}" ;; *) ;; esac >> ${specfile} diff --git a/scripts-ada/mkgnatnewlibspec.in b/scripts-ada/mkgnatnewlibspec.in index cea5cc1b03..523f9edcfe 100644 --- a/scripts-ada/mkgnatnewlibspec.in +++ b/scripts-ada/mkgnatnewlibspec.in @@ -55,13 +55,15 @@ target_alias=$1 . ./$CFG -specfile=${dst}/$target_alias-gcc-${gcc_version}-newlib-${newlib_version}.spec +specfile=${dst}/${target_alias}-gnat-${gnat_version}-newlib-${newlib_version}.spec sed -e "s%@Release@%${gnatnewlib_rpm_release}%g" \ -e "s%@target_alias@%${target_alias}%g" \ -e "s%@rpm_build_root@%${rpm_build_root}%g" \ -e "s%@gcc_version@%${gcc_version}%g" \ - -e "s%@gcc_patch_version@%${gcc_patch_version}%g" \ + -e "s%@gcc_patch_version@%$gnat-{gcc_patch_version}%g" \ + -e "s%@gnat_version@%${gnat_version}%g" \ + -e "s%@gnat_patch_version@%${gnat_patch_version}%g" \ -e "s%@newlib_version@%${newlib_version}%g" \ -e "s%@newlib_patch_version@%${newlib_patch_version}%g" \ -e "s%@exe_ext@%${exe_ext}%g" \ -- cgit v1.2.3