Sync with rtems-4.9.

This commit is contained in:
Ralf Corsepius
2009-07-26 06:09:18 +00:00
parent cdeed5a674
commit 0973a00638
6 changed files with 88 additions and 24 deletions

View File

@@ -31,7 +31,7 @@ Requires: m4 gawk
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
@SOURCES@
%description
GNU's Autoconf is a tool for configuring source code and Makefiles.
@@ -48,6 +48,7 @@ their use.
%prep
%setup -q -n autoconf-%{srcvers}
%{?PATCH0:%patch0 -p1}
# Work around rpm inserting bogus perl-module deps
cat << \EOF > %{name}-prov

View File

@@ -4,10 +4,12 @@ AUTOCONF_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
AUTOCONF_SUBPACKAGES += $(top_srcdir)/common/clean.add
AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add
autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in
autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in $(srcdir)/autoconf-sources.add
cat $(AUTOCONF_SUBPACKAGES) | sed \
-e "/[@]SOURCES[@]/r $(srcdir)/autoconf-sources.add" \
-e "/[@]SOURCES[@]/d" \
-e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \
-e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)/" > $@
-e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)%{?dist}/" > $@
CLEANFILES += autoconf.spec.in

View File

@@ -25,12 +25,16 @@ Provides: @rpmprefix@automake-rtems = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{requirements} perl help2man
BuildRequires: %{requirements} perl
%if "%{version}" < "1.11"
# automake >= 1.11 ships man-pages
BuildRequires: help2man
%endif
Requires: %{requirements}
Requires(post): /sbin/install-info
Requires(preun):/sbin/install-info
Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
@SOURCES@
%description
Automake is a tool for automatically generating "Makefile.in"s from
@@ -41,6 +45,7 @@ standards.
%prep
%setup -q -n automake-%{srcvers}
%{?PATCH0:%patch0 -p1}
# Work around rpm inserting bogus perl-module deps
cat << \EOF > %{name}-prov
@@ -73,6 +78,8 @@ make
rm -rf "$RPM_BUILD_ROOT"
make DESTDIR=${RPM_BUILD_ROOT} install
%if "%{version}" < "1.11"
# automake >= 1.11 ships man-pages
install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
$RPM_BUILD_ROOT%{_bindir}/automake ;
@@ -81,6 +88,7 @@ do
help2man $i > `basename $i`.1
install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
done
%endif
%if "%{_prefix}" != "/usr"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal

View File

@@ -4,10 +4,12 @@ AUTOMAKE_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add
AUTOMAKE_SUBPACKAGES += $(top_srcdir)/common/clean.add
AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add
automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.in
automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.am $(srcdir)/automake-sources.add
cat $(AUTOMAKE_SUBPACKAGES) | sed \
-e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/" \
-e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)/" > $@
-e "/[@]SOURCES[@]/r $(srcdir)/automake-sources.add" \
-e "/[@]SOURCES[@]/d" \
-e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/g" \
-e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)%{?dist}/g" > $@
CLEANFILES += automake.spec.in

View File

@@ -3,24 +3,44 @@
# http://www.rtems.org/bugzilla
#
%define _prefix /opt/rtems-4.8
%define _infodir %{_prefix}/info
%define _mandir %{_prefix}/man
%define _prefix /opt/rtems-4.8
%define _exec_prefix %{_prefix}
%define _bindir %{_exec_prefix}/bin
%define _sbindir %{_exec_prefix}/sbin
%define _libexecdir %{_exec_prefix}/libexec
%define _datarootdir %{_prefix}/share
%define _datadir %{_datarootdir}
%define _sysconfdir %{_prefix}/etc
%define _sharedstatedir %{_prefix}/com
%define _localstatedir %{_prefix}/var
%define _includedir %{_prefix}/include
%define _libdir %{_exec_prefix}/%{_lib}
%define _mandir %{_datarootdir}/man
%define _infodir %{_datarootdir}/info
%define _localedir %{_datarootdir}/locale
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
%define debug_package %{nil}
%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
%define _libdir %{_exec_prefix}/lib
%define debug_package %{nil}
%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
%define optflags %{_mingw32_cflags}
%else
%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
%endif
%endif
%if "%{_build}" != "%{_host}"
%define _host_rpmprefix rtems-4.8-%{_host}-
%define _host_rpmprefix %{_host}-
%else
%define _host_rpmprefix %{nil}
%endif
@@ -36,7 +56,7 @@ License: GPL
URL: http://www.gnu.org/software/autoconf
Group: Development/Tools
Version: %{rpmvers}
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Tool for automatically generating GNU style Makefile.in's
Obsoletes: rtems-4.8-autoconf-rtems < %{version}-%{release}
@@ -52,7 +72,8 @@ Requires: m4 gawk
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2
%description
GNU's Autoconf is a tool for configuring source code and Makefiles.
@@ -69,6 +90,7 @@ their use.
%prep
%setup -q -n autoconf-%{srcvers}
%{?PATCH0:%patch0 -p1}
# Work around rpm inserting bogus perl-module deps
cat << \EOF > %{name}-prov

View File

@@ -3,24 +3,44 @@
# http://www.rtems.org/bugzilla
#
%define _prefix /opt/rtems-4.8
%define _infodir %{_prefix}/info
%define _mandir %{_prefix}/man
%define _prefix /opt/rtems-4.8
%define _exec_prefix %{_prefix}
%define _bindir %{_exec_prefix}/bin
%define _sbindir %{_exec_prefix}/sbin
%define _libexecdir %{_exec_prefix}/libexec
%define _datarootdir %{_prefix}/share
%define _datadir %{_datarootdir}
%define _sysconfdir %{_prefix}/etc
%define _sharedstatedir %{_prefix}/com
%define _localstatedir %{_prefix}/var
%define _includedir %{_prefix}/include
%define _libdir %{_exec_prefix}/%{_lib}
%define _mandir %{_datarootdir}/man
%define _infodir %{_datarootdir}/info
%define _localedir %{_datarootdir}/locale
%ifos cygwin cygwin32 mingw mingw32
%define _exeext .exe
%define debug_package %{nil}
%define _libdir %{_exec_prefix}/lib
%else
%define _exeext %{nil}
%endif
%ifos cygwin cygwin32
%define optflags -O3 -pipe -march=i486 -funroll-loops
%define _libdir %{_exec_prefix}/lib
%define debug_package %{nil}
%endif
%ifos mingw mingw32
%if %{defined _mingw32_cflags}
%define optflags %{_mingw32_cflags}
%else
%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields
%endif
%endif
%if "%{_build}" != "%{_host}"
%define _host_rpmprefix rtems-4.8-%{_host}-
%define _host_rpmprefix %{_host}-
%else
%define _host_rpmprefix %{nil}
%endif
@@ -37,7 +57,7 @@ URL: http://sources.redhat.com/automake
License: GPL
Group: Development/Tools
Version: %{rpmvers}
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Tool for automatically generating GNU style Makefile.in's
Obsoletes: rtems-4.8-automake-rtems < %{version}-%{release}
@@ -45,13 +65,18 @@ Provides: rtems-4.8-automake-rtems = %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{requirements} perl help2man
BuildRequires: %{requirements} perl
%if "%{version}" < "1.11"
# automake >= 1.11 ships man-pages
BuildRequires: help2man
%endif
Requires: %{requirements}
Requires(post): /sbin/install-info
Requires(preun):/sbin/install-info
Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2
%description
Automake is a tool for automatically generating "Makefile.in"s from
files called "Makefile.am". "Makefile.am" is basically a series of
@@ -61,6 +86,7 @@ standards.
%prep
%setup -q -n automake-%{srcvers}
%{?PATCH0:%patch0 -p1}
# Work around rpm inserting bogus perl-module deps
cat << \EOF > %{name}-prov
@@ -93,6 +119,8 @@ make
rm -rf "$RPM_BUILD_ROOT"
make DESTDIR=${RPM_BUILD_ROOT} install
%if "%{version}" < "1.11"
# automake >= 1.11 ships man-pages
install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1
for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \
$RPM_BUILD_ROOT%{_bindir}/automake ;
@@ -101,6 +129,7 @@ do
help2man $i > `basename $i`.1
install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1
done
%endif
mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal
echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist