Clean up the configurations. Add internal/external autotools support.

This commit is contained in:
Chris Johns 2012-11-05 10:40:16 +11:00
parent 3493ada70e
commit 7ff4c5b433
15 changed files with 70 additions and 33 deletions

View File

@ -3,21 +3,22 @@
#
# This configuration file configure's, make's and install's autoconf
#
# Warning: this package is only for bootstrapping within a build.
#
%warning This autoconf build is for internal bootstraps, no package created
Name: autoconf-%{autoconf_version}-%{_host}-%{release}
Summary: Autoconf v%{autoconf_version} for host %{_host}
Version: %{autoconf_version}
Release: %{release}
URL: http://www.gnu.org/software/autoconf/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%description
Autoconf for host %{_host}.
#
# Source
#
Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{autoconf_version}.tar.gz
VersionControl0: git clone git://git.sv.gnu.org/autoconf
#
# Prepare the source code.
@ -32,6 +33,12 @@ cd ..
export PATH="%{_bindir}:${PATH}"
cd autoconf-%{autoconf_version}
if "%{_internal_autotools}" == "yes"; then
ac_prefix=$SB_TMPPREFIX
else
ac_prefix=%{prefix}
fi
%if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif
@ -40,7 +47,7 @@ cd ..
--build=%{_build} --host=%{_host} \
--verbose --disable-nls \
--without-included-gettext \
--prefix=$SB_TMPPREFIX
--prefix=${ac_prefix}
%{__make} %{?_smp_mflags} all
@ -51,6 +58,11 @@ cd ..
rm -rf $SB_BUILD_ROOT
cd autoconf-%{autoconf_version}
%{__make} install
if "%{_internal_autotools}" == "yes"; then
%{__make} install
else
%{__make} DESTDIR=$SB_BUILD_ROOT install
fi
cd ..

View File

@ -10,11 +10,6 @@
%define autoconf_version 2.68
Name: autoconf-%{autoconf_version}-%{_host}-%{release}
%description
Autoconf for host %{_host}.
#
# The autoconf build instructions. We use 2.xx Release 1.
#

View File

@ -0,0 +1,8 @@
#
# Internal Autoconf 2.68.
#
%warning This autoconf build is for internal bootstraps, no package created
%define _internal_autotools yes
%include %{_configdir}/autoconf-2.68-1.cfg

View File

@ -6,18 +6,21 @@
# Warning: this package is only for bootstrapping within a build.
#
%warning This automake build is for internal bootstraps, no package created
Name: automake-%{automake_version}-%{_host}-%{release}
Summary: Automake v%{automake_version} for host %{_host}
Version: %{automake_version}
Release: %{release}
URL: http://www.gnu.org/software/automake/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%description
Automake for host %{_host}.
#
# Source
#
Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{automake_version}.tar.gz
VersionControl0: git clone git://git.savannah.gnu.org/automake.git
#
# Prepare the source code.
@ -33,6 +36,12 @@ cd ..
cd automake-%{automake_version}
if "%{_internal_autotools}" == "yes"; then
am_prefix=$SB_TMPPREFIX
else
am_prefix=%{prefix}
fi
%if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif
@ -40,7 +49,7 @@ cd ..
./configure \
--build=%{_build} --host=%{_host} \
--verbose \
--prefix=$SB_TMPPREFIX
--prefix=${am_prefix}
%{__make} %{?_smp_mflags} all
@ -51,6 +60,11 @@ cd ..
rm -rf $SB_BUILD_ROOT
cd automake-%{automake_version}
%{__make} install
if "%{_internal_autotools}" == "yes"; then
%{__make} install
else
%{__make} DESTDIR=$SB_BUILD_ROOT install
fi
cd ..

View File

@ -10,11 +10,6 @@
%define automake_version 1.12
Name: automake-%{automake_version}-%{_host}-%{release}
%description
Automake for host %{_host}.
#
# The automake build instructions. We use 1.xx Release 1.
#

View File

@ -0,0 +1,8 @@
#
# Internal Automake 1.12
#
%warning This automake build is for internal bootstraps, no package created
%define _internal_autotools yes
%include %{_configdir}/automake-1.12-1.cfg

View File

@ -6,16 +6,21 @@
%include %{_configdir}/checks.cfg
Name: %{_target}-binutils-%{binutils_version}-%{release}
Summary: Binutils v%{binutils_version} for target %{_target} on host %{_host}
Version: %{binutils_version}
Release: %{release}
URL: http://sources.redhat.com/binutils
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%description
Cross binutils for target %{_target}.
#
# Source
#
Source0: ftp://ftp.gnu.org/gnu/binutils/binutils-%{binutils_version}.tar.bz2
VersionControl0: cvs -z 9 -d :pserver:anoncvs@sourceware.org:/cvs/src co binutils
#
# Prepare the source code.

View File

@ -7,11 +7,6 @@
%define binutils_version 2.22
Name: %{_target}-binutils-%{binutils_version}-%{release}
%description
Cross binutils for target %{_target}.
#
# The binutils build instructions. We use 2.xx Release 1.
#

View File

@ -8,12 +8,16 @@
%error No 'release' defined
%endif
Name: expat-%{expat_version}-%{_host}-%{release}
Summary: Expat XML Parser v%{expat_version} for target %{_target} on host %{_host}
Version: %{expat_version}
Release: %{release}
URL: http://expat.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
%description
Expat for host %{_host}.
#
# Source
#

View File

@ -10,11 +10,6 @@
%define expat_version 2.1.0
Name: expat-%{expat_version}-%{_host}-%{release}
%description
Expat for host %{_host}.
#
# The Expat build instructions. We use 2.xx Release 1.
#

View File

@ -11,6 +11,7 @@
%error No GCC Version message defined.
%endif
Name: %{_target}-gcc-%{gcc_version}-newlib-%{newlib_version}-%{release}
Summary: GCC v%{gcc_version} and Newlib v%{newlib_version} for target %{_target} on host %{_host}
Version: %{gcc_version}
Release: %{release}
@ -24,6 +25,8 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
# GCC core and G++
#
Source0: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-core-%{gcc_version}.tar.bz2
VersionContro0: git clone git://gcc.gnu.org/git/gcc.git
%if %{enable_cxx}
Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_version}.tar.gz
%endif
@ -32,6 +35,7 @@ Source1: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-g++-%{gcc_version}.tar
# Newlib
#
Source10: ftp://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
VersionControl10: cvs -z 9 -d :pserver:anoncvs@sources.redhat.com:/cvs/src co newlib
#
# Packages GCC requires

View File

@ -11,8 +11,6 @@
%define mpc_version 0.8.2
%define gmp_version 5.0.1
Name: %{_target}-gcc-%{gcc_version}-newlib-%{newlib_version}-%{release}
#
# The gcc/newlib build instructions. We use 4.6 Release 1.
#

View File

@ -6,6 +6,7 @@
%include %{_configdir}/checks.cfg
Name: %{_target}-gdb-%{gdb_version}-%{release}
Summary: GDB v%{gdb_version} for target %{_target} on host %{_host}
Version: %{gdb_version}
Release: %{release}
@ -16,6 +17,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
# Source
#
Source0: http://ftp.gnu.org/gnu/gdb/gdb-%{gdb_version}.tar.bz2
VersionControl0 git clone git://sourceware.org/git/gdb.git
#
# Prepare the source code.

View File

@ -18,6 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
# Source
#
Source0: http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-%{libusb_version}/libusb-%{libusb_version}.tar.bz2
VersionControl0: git clone git://git.libusb.org/libusb.git
#
# Prepare the source code.

View File

@ -23,7 +23,8 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
# Source
#
Source0: https://api.github.com/repos/texane/stlink/texane-stlink-%{stlink_version}.tar.gz
Patch0: texane-stlink-3494c11-1.diff
VersionControl0: git clone https://github.com/texane/stlink.git
Patch0: texane-stlink-3494c11-1.diff
#
# Prepare the source code.