From d21091b98b19ce3d53555f0820fc32db5141cb0f Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 25 Oct 2002 14:52:25 +0000 Subject: 2002-10-25 Joel Sherrill * 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. --- scripts/ChangeLog | 11 ++++ scripts/Makefile.am | 2 +- scripts/autotools/autoconf-rtems.spec | 89 -------------------------------- scripts/autotools/autoconf-rtems.spec.in | 88 +++++++++++++++++++++++++++++++ scripts/autotools/automake-rtems.spec.in | 3 +- scripts/configure.ac | 1 + scripts/gcc3newlib/Makefile.am | 4 +- 7 files changed, 104 insertions(+), 94 deletions(-) delete mode 100644 scripts/autotools/autoconf-rtems.spec create mode 100644 scripts/autotools/autoconf-rtems.spec.in 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 + + * 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 * 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 deleted file mode 100644 index 6f8baacf49..0000000000 --- a/scripts/autotools/autoconf-rtems.spec +++ /dev/null @@ -1,89 +0,0 @@ -# -# spec file for autoconf -# - -%define rpmvers 2.52 -%define srcvers 2.52 - -%define _defaultbuildroot /var/tmp/%{name}-%{srcvers}-root -%define _prefix /opt/rtems -%define _name autoconf - -%if "%{_prefix}" != "/usr" -%define name %{_name}-rtems -%define _infodir %{_prefix}/info -%define _mandir %{_prefix}/man -%else -%define name %{_name} -%endif - - -Vendor: http://www.rtems.com -Name: %{name} -Packager: Ralf Corsepius - -Copyright: GPL -URL: http://www.gnu.org/software/autoconf -Group: rtems -Provides: autoconf -Autoreqprov: on -Version: %{rpmvers} -Release: 0 -Summary: Tool for automatically generating GNU style Makefile.in's -BuildArch: noarch -BuildRoot: %{_defaultbuildroot} -BuildPreReq: autoconf perl m4 gawk -PreReq: /sbin/install-info - -Source: autoconf-%{srcvers}.tar.bz2 - -%description -GNU's Autoconf is a tool for configuring source code and Makefiles. -Using Autoconf, programmers can create portable and configurable -packages, since the person building the package is allowed to -specify various configuration options. -You should install Autoconf if you are developing software and you'd -like to use it to create shell scripts which will configure your -source code packages. -Note that the Autoconf package is not required for the end user who -may be configuring software with an Autoconf-generated script; -Autoconf is only required for the generation of the scripts, not -their use. - -%prep -%setup -q -n %{_name}-%{srcvers} - -%build -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} -make - -%install -%makeinstall -gzip -9qf $RPM_BUILD_ROOT%{_infodir}/autoconf.info* 2>/dev/null -# RTEMS's standards.info comes from binutils -rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info* -# gzip -9qf $RPM_BUILD_ROOT%{_infodir}/standards.info* 2>/dev/null -gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/* 2>/dev/null - -%clean -[ x"$RPM_BUILD_ROOT" = x"%{_defaultbuildroot}" ] ; \ - rm -rf "$RPM_BUILD_ROOT" - -%post -install-info --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz -#install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz - -%preun -if [ $1 = 0 ]; then - install-info --delete --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz -# install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz -fi - -%files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS -%{_bindir}/* -%doc %{_infodir}/autoconf.info*.gz -#%doc %{_infodir}/standards.info*.gz -%doc %{_mandir}/man?/*.gz -%{_datadir}/autoconf diff --git a/scripts/autotools/autoconf-rtems.spec.in b/scripts/autotools/autoconf-rtems.spec.in new file mode 100644 index 0000000000..93506e4d4d --- /dev/null +++ b/scripts/autotools/autoconf-rtems.spec.in @@ -0,0 +1,88 @@ +# +# spec file for autoconf +# + +%define rpmvers 2.52 +%define srcvers 2.52 + +%define _defaultbuildroot %{_tmppath}/%{name}-%{srcvers}-root +%define _prefix @prefix @ +%define _name autoconf + +%if "%{_prefix}" != "/usr" +%define name %{_name}-rtems +%define _infodir %{_prefix}/info +%define _mandir %{_prefix}/man +%else +%define name %{_name} +%endif + + +Vendor: http://www.rtems.com +Name: %{name} +Packager: Ralf Corsepius + +Copyright: GPL +URL: http://www.gnu.org/software/autoconf +Group: rtems +Autoreqprov: on +Version: %{rpmvers} +Release: 1 +Summary: Tool for automatically generating GNU style Makefile.in's +BuildArch: noarch +BuildRoot: %{_defaultbuildroot} +BuildPreReq: autoconf perl m4 gawk +PreReq: /sbin/install-info + +Source: autoconf-%{srcvers}.tar.bz2 + +%description +GNU's Autoconf is a tool for configuring source code and Makefiles. +Using Autoconf, programmers can create portable and configurable +packages, since the person building the package is allowed to +specify various configuration options. +You should install Autoconf if you are developing software and you'd +like to use it to create shell scripts which will configure your +source code packages. +Note that the Autoconf package is not required for the end user who +may be configuring software with an Autoconf-generated script; +Autoconf is only required for the generation of the scripts, not +their use. + +%prep +%setup -q -n %{_name}-%{srcvers} + +%build +./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} +make + +%install +%makeinstall +gzip -9qf $RPM_BUILD_ROOT%{_infodir}/autoconf.info* 2>/dev/null +# RTEMS's standards.info comes from binutils +rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info* +# gzip -9qf $RPM_BUILD_ROOT%{_infodir}/standards.info* 2>/dev/null +gzip -9qf $RPM_BUILD_ROOT%{_mandir}/man?/* 2>/dev/null + +%clean +[ x"$RPM_BUILD_ROOT" = x"%{_defaultbuildroot}" ] ; \ + rm -rf "$RPM_BUILD_ROOT" + +%post +install-info --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz +#install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz + +%preun +if [ $1 = 0 ]; then + install-info --delete --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz +# install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz +fi + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING ChangeLog NEWS README THANKS +%{_bindir}/* +%doc %{_infodir}/autoconf.info*.gz +#%doc %{_infodir}/standards.info*.gz +%doc %{_mandir}/man?/*.gz +%{_datadir}/autoconf 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 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 -- cgit v1.2.3