diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-10-25 14:52:25 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-10-25 14:52:25 +0000 |
| commit | d21091b98b19ce3d53555f0820fc32db5141cb0f (patch) | |
| tree | a5bf29eeeeddde187f7a9dad361ce70964e53995 | |
| parent | 2002-10-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d21091b98b19ce3d53555f0820fc32db5141cb0f.tar.bz2 | |
2002-10-25 Joel Sherrill <joel@OARcorp.com>
* autotools/autoconf-rtems.spec.in: New.
Remove Provides: autoconf (Conflicts with RH-8.0).
* autotools/autoconf-rtems.spec: Remove.
* autotools/automake-rtems.spec.in:
Remove Provides: automake (Conflicts with RH-8.0).
* gcc3newlib/Makefile.am: Remove references to mkgcc3newlibspec.
* Makefile.am: Ditto.
* configure.ac: Add autotools/autoconf-rtems.spec.in.
| -rw-r--r-- | scripts/ChangeLog | 11 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/autotools/autoconf-rtems.spec.in (renamed from scripts/autotools/autoconf-rtems.spec) | 7 | ||||
| -rw-r--r-- | scripts/autotools/automake-rtems.spec.in | 3 | ||||
| -rw-r--r-- | scripts/configure.ac | 1 | ||||
| -rw-r--r-- | scripts/gcc3newlib/Makefile.am | 4 |
6 files changed, 19 insertions, 9 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 1878443e7f..4ada8f7d79 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,14 @@ +2002-10-25 Joel Sherrill <joel@OARcorp.com> + + * autotools/autoconf-rtems.spec.in: New. + Remove Provides: autoconf (Conflicts with RH-8.0). + * autotools/autoconf-rtems.spec: Remove. + * autotools/automake-rtems.spec.in: + Remove Provides: automake (Conflicts with RH-8.0). + * gcc3newlib/Makefile.am: Remove references to mkgcc3newlibspec. + * Makefile.am: Ditto. + * configure.ac: Add autotools/autoconf-rtems.spec.in. + 2002-10-24 Joel Sherrill <joel@OARcorp.com> * setup.def: Update gcc 3.2 pathc to includ epatch for gcc PR8314. diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 94444380e9..cb9b9f787f 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -7,7 +7,7 @@ ACLOCAL_AMFLAGS = -I ../aclocal SUBDIRS = . binutils gccnewlib gcc3newlib gdb rtems autotools cpukit noinst_SCRIPTS = setup buildall buildalltar mkbinutilspec mkbspspec \ - mkgccnewlibspec mkgcc3newlibspec mkgdbspec mkrpms mkspec + mkgccnewlibspec mkgdbspec mkrpms mkspec TEMPLATES = diff --git a/scripts/autotools/autoconf-rtems.spec b/scripts/autotools/autoconf-rtems.spec.in index 6f8baacf49..93506e4d4d 100644 --- a/scripts/autotools/autoconf-rtems.spec +++ b/scripts/autotools/autoconf-rtems.spec.in @@ -5,8 +5,8 @@ %define rpmvers 2.52 %define srcvers 2.52 -%define _defaultbuildroot /var/tmp/%{name}-%{srcvers}-root -%define _prefix /opt/rtems +%define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root +%define _prefix @prefix @ %define _name autoconf %if "%{_prefix}" != "/usr" @@ -25,10 +25,9 @@ Packager: Ralf Corsepius <corsepiu@faw.uni-ulm.de> Copyright: GPL URL: http://www.gnu.org/software/autoconf Group: rtems -Provides: autoconf Autoreqprov: on Version: %{rpmvers} -Release: 0 +Release: 1 Summary: Tool for automatically generating GNU style Makefile.in's BuildArch: noarch BuildRoot: %{_defaultbuildroot} diff --git a/scripts/autotools/automake-rtems.spec.in b/scripts/autotools/automake-rtems.spec.in index 035a4e4dd1..2bf4c2c241 100644 --- a/scripts/autotools/automake-rtems.spec.in +++ b/scripts/autotools/automake-rtems.spec.in @@ -26,10 +26,9 @@ Packager: Ralf Corsepius <ralf@links2linux.de> Copyright: GPL Group: rtems -Provides: automake Autoreqprov: on Version: %{rpmvers} -Release: 0 +Release: 1 Summary: Tool for automatically generating GNU style Makefile.in's BuildArch: noarch BuildRoot: %{_defaultbuildroot} diff --git a/scripts/configure.ac b/scripts/configure.ac index 4e46dd5f3a..de2ea08d65 100644 --- a/scripts/configure.ac +++ b/scripts/configure.ac @@ -85,6 +85,7 @@ gdb/Makefile rtems/Makefile autotools/Makefile autotools/automake-rtems.spec +autotools/autoconf-rtems.spec cpukit/Makefile ]) diff --git a/scripts/gcc3newlib/Makefile.am b/scripts/gcc3newlib/Makefile.am index 37c9f051ac..36e97724dd 100644 --- a/scripts/gcc3newlib/Makefile.am +++ b/scripts/gcc3newlib/Makefile.am @@ -18,7 +18,7 @@ gccnewlib.spec.in: $(SUBPACKAGES) cat $^ > $@ CLEANFILES = gccnewlib.spec.in -MKGCCNEWLIBSPEC_DEPS = $(top_builddir)/mkgcc3newlibspec gccnewlib.spec.in \ +MKGCCNEWLIBSPEC_DEPS = mkspec gccnewlib.spec.in \ $(top_builddir)/setup.cache RPM_SPECS_DATA = @@ -27,7 +27,7 @@ arm-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache arm-rtems > $@ RPM_SPECS_DATA += arm-rtems-$(GCC3NEWLIBVERS).spec -c4x-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIB_DEPS) +c4x-rtems-$(GCC3NEWLIBVERS).spec: $(MKGCCNEWLIBSPEC_DEPS) $(MKSPEC) -cfg $(top_builddir)/setup.cache c4x-rtems > $@ RPM_SPECS_DATA += c4x-rtems-$(GCC3NEWLIBVERS).spec |