summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-07-26 06:09:18 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-07-26 06:09:18 +0000
commit0973a00638b20a0d0d02098d2c8abb08c74110c4 (patch)
treef284ef4cb63275f4a77115ce8ee96426e33df87a
parentUpdate. (diff)
downloadrtems-0973a00638b20a0d0d02098d2c8abb08c74110c4.tar.bz2
Sync with rtems-4.9.
-rw-r--r--contrib/crossrpms/autotools/autoconf.add3
-rw-r--r--contrib/crossrpms/autotools/autoconf.am6
-rw-r--r--contrib/crossrpms/autotools/automake.add12
-rw-r--r--contrib/crossrpms/autotools/automake.am8
-rw-r--r--contrib/crossrpms/autotools/rtems-4.8-autoconf.spec38
-rw-r--r--contrib/crossrpms/autotools/rtems-4.8-automake.spec45
6 files changed, 88 insertions, 24 deletions
diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add
index b24f0bcdd7..2435548d9d 100644
--- a/contrib/crossrpms/autotools/autoconf.add
+++ b/contrib/crossrpms/autotools/autoconf.add
@@ -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
diff --git a/contrib/crossrpms/autotools/autoconf.am b/contrib/crossrpms/autotools/autoconf.am
index a98c962e4b..8e0d714f54 100644
--- a/contrib/crossrpms/autotools/autoconf.am
+++ b/contrib/crossrpms/autotools/autoconf.am
@@ -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
diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add
index 55c3aa9252..d518aa3364 100644
--- a/contrib/crossrpms/autotools/automake.add
+++ b/contrib/crossrpms/autotools/automake.add
@@ -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
diff --git a/contrib/crossrpms/autotools/automake.am b/contrib/crossrpms/autotools/automake.am
index bd0b33c3e1..87c0567549 100644
--- a/contrib/crossrpms/autotools/automake.am
+++ b/contrib/crossrpms/autotools/automake.am
@@ -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
diff --git a/contrib/crossrpms/autotools/rtems-4.8-autoconf.spec b/contrib/crossrpms/autotools/rtems-4.8-autoconf.spec
index 1d713c213e..c5572198f3 100644
--- a/contrib/crossrpms/autotools/rtems-4.8-autoconf.spec
+++ b/contrib/crossrpms/autotools/rtems-4.8-autoconf.spec
@@ -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
diff --git a/contrib/crossrpms/autotools/rtems-4.8-automake.spec b/contrib/crossrpms/autotools/rtems-4.8-automake.spec
index 67cf167f38..ca2d2756ee 100644
--- a/contrib/crossrpms/autotools/rtems-4.8-automake.spec
+++ b/contrib/crossrpms/autotools/rtems-4.8-automake.spec
@@ -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