Cleaned up configuration. Allow the sb-builder to directly build packages.

This commit is contained in:
Chris Johns 2012-11-05 12:27:35 +11:00
parent 3071050a39
commit 2181fb8b8d
15 changed files with 40 additions and 47 deletions

View File

@ -4,6 +4,10 @@
# This configuration file configure's, make's and install's autoconf # This configuration file configure's, make's and install's autoconf
# #
ifn %{defined _internal_autotools}
%define _internal_autotools no
%endfi
Name: autoconf-%{autoconf_version}-%{_host}-%{release} Name: autoconf-%{autoconf_version}-%{_host}-%{release}
Summary: Autoconf v%{autoconf_version} for host %{_host} Summary: Autoconf v%{autoconf_version} for host %{_host}
Version: %{autoconf_version} Version: %{autoconf_version}
@ -11,9 +15,6 @@ Release: %{release}
URL: http://www.gnu.org/software/autoconf/ URL: http://www.gnu.org/software/autoconf/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%description
Autoconf for host %{_host}.
# #
# Source # Source
# #
@ -36,7 +37,7 @@ cd ..
if "%{_internal_autotools}" == "yes"; then if "%{_internal_autotools}" == "yes"; then
ac_prefix=$SB_TMPPREFIX ac_prefix=$SB_TMPPREFIX
else else
ac_prefix=%{prefix} ac_prefix=%{_prefix}
fi fi
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"

View File

@ -2,8 +2,8 @@
# Autoconf 2.68. # Autoconf 2.68.
# #
%ifn %{defined release} %if %{release} == %{nil}
%error No 'release' defined %define release 1
%endif %endif
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg

View File

@ -2,19 +2,14 @@
# Autoconf 2.22. # Autoconf 2.22.
# #
%ifn %{defined release} %if %{release} == %{nil}
%error No 'release' defined %define release 1
%endif %endif
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg
%define autoconf_version 2.69 %define autoconf_version 2.69
Name: autoconf-%{autoconf_version}-%{_host}-%{release}
%description
Autoconf for host %{_host}.
# #
# The autoconf build instructions. We use 2.xx Release 1. # The autoconf build instructions. We use 2.xx Release 1.
# #

View File

@ -3,8 +3,10 @@
# #
# This configuration file configure's, make's and install's automake # This configuration file configure's, make's and install's automake
# #
# Warning: this package is only for bootstrapping within a build.
# ifn %{defined _internal_autotools}
%define _internal_autotools no
%endfi
Name: automake-%{automake_version}-%{_host}-%{release} Name: automake-%{automake_version}-%{_host}-%{release}
Summary: Automake v%{automake_version} for host %{_host} Summary: Automake v%{automake_version} for host %{_host}
@ -13,9 +15,6 @@ Release: %{release}
URL: http://www.gnu.org/software/automake/ URL: http://www.gnu.org/software/automake/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%description
Automake for host %{_host}.
# #
# Source # Source
# #
@ -39,7 +38,7 @@ cd ..
if "%{_internal_autotools}" == "yes"; then if "%{_internal_autotools}" == "yes"; then
am_prefix=$SB_TMPPREFIX am_prefix=$SB_TMPPREFIX
else else
am_prefix=%{prefix} am_prefix=%{_prefix}
fi fi
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"

View File

@ -2,8 +2,8 @@
# Automake 1.12 # Automake 1.12
# #
%ifn %{defined release} %if %{release} == %{nil}
%error No 'release' defined %define release 1
%endif %endif
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg

View File

@ -13,9 +13,6 @@ Release: %{release}
URL: http://sources.redhat.com/binutils URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%description
Cross binutils for target %{_target}.
# #
# Source # Source
# #

View File

@ -2,6 +2,10 @@
# Binutils 2.22. # Binutils 2.22.
# #
%if %{release} == %{nil}
%define release 1
%endif
%include %{_configdir}/checks.cfg %include %{_configdir}/checks.cfg
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg

View File

@ -4,8 +4,8 @@
# This configuration file configure's, make's and install's expat. # This configuration file configure's, make's and install's expat.
# #
%ifn %{defined release} %if %{release} == %{nil}
%error No 'release' defined %define release 1
%endif %endif
Name: expat-%{expat_version}-%{_host}-%{release} Name: expat-%{expat_version}-%{_host}-%{release}
@ -15,9 +15,6 @@ Release: %{release}
URL: http://expat.sourceforge.net/ URL: http://expat.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%description
Expat for host %{_host}.
# #
# Source # Source
# #

View File

@ -2,8 +2,8 @@
# Expat 2.1.0 # Expat 2.1.0
# #
%ifn %{defined release} %if %{release} == %{nil}
%error No 'release' defined %define release 1
%endif %endif
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg

View File

@ -2,6 +2,10 @@
# GCC 2.6, Newlib 1.20 # GCC 2.6, Newlib 1.20
# #
%if %{release} == %{nil}
%define release 1
%endif
%include %{_configdir}/checks.cfg %include %{_configdir}/checks.cfg
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg

View File

@ -2,16 +2,15 @@
# GDB 7.5. # GDB 7.5.
# #
%if %{release} == %{nil}
%define release 1
%endif
%include %{_configdir}/checks.cfg %include %{_configdir}/checks.cfg
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg
%define gdb_version 7.5 %define gdb_version 7.5
Name: %{_target}-gdb-%{gdb_version}-%{release}
%description
Cross gdb for target %{_target}.
# #
# The gdb build instructions. We use 7.xx Release 1. # The gdb build instructions. We use 7.xx Release 1.
# #

View File

@ -4,8 +4,8 @@
# This configuration file configure's, make's and install's libusb. # This configuration file configure's, make's and install's libusb.
# #
%ifn %{defined release} %if %{release} == %{nil}
%error No 'release' defined %define release 1
%endif %endif
Summary: LibUSB v%{libusb_version} for target %{_target} on host %{_host} Summary: LibUSB v%{libusb_version} for target %{_target} on host %{_host}

View File

@ -6,6 +6,8 @@
# Warning: this package is only for bootstrapping within a build. # Warning: this package is only for bootstrapping within a build.
# #
Name: m4-%{m4_version}-%{_host}-%{release}
Summary: M4 v%{m4_version} for host %{_host} Summary: M4 v%{m4_version} for host %{_host}
Version: %{m4_version} Version: %{m4_version}
Release: %{release} Release: %{release}

View File

@ -2,19 +2,14 @@
# M4 1.4.16 # M4 1.4.16
# #
%ifn %{defined release} %if %{release} == %{nil}
%error No 'release' defined %define release 1
%endif %endif
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg
%define m4_version 1.4.16 %define m4_version 1.4.16
Name: m4-%{m4_version}-%{_host}-%{release}
%description
M4 for host %{_host}.
# #
# The m4 build instructions. We use 1.x.x Release 1. # The m4 build instructions. We use 1.x.x Release 1.
# #

View File

@ -4,8 +4,8 @@
# This configuration file configure's, make's and install's SL-Link. # This configuration file configure's, make's and install's SL-Link.
# #
%ifn %{defined release} %if %{release} == %{nil}
%error No 'release' defined %define release 1
%endif %endif
%include %{_configdir}/base.cfg %include %{_configdir}/base.cfg