Fix the TB_ environment variables.

This commit is contained in:
Chris Johns 2012-10-31 22:34:45 +11:00
parent 07607e2667
commit a77f784f78
7 changed files with 42 additions and 42 deletions

View File

@ -35,12 +35,12 @@ cd ..
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif %endif
CFLAGS="$TB_OPT_FLAGS" \ CFLAGS="$SB_OPT_FLAGS" \
./configure \ ./configure \
--build=%{_build} --host=%{_host} \ --build=%{_build} --host=%{_host} \
--verbose --disable-nls \ --verbose --disable-nls \
--without-included-gettext \ --without-included-gettext \
--prefix=$TB_TMPPREFIX --prefix=$SB_TMPPREFIX
%{__make} %{?_smp_mflags} all %{__make} %{?_smp_mflags} all
@ -48,7 +48,7 @@ cd ..
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
rm -rf $TB_BUILD_ROOT rm -rf $SB_BUILD_ROOT
cd autoconf-%{autoconf_version} cd autoconf-%{autoconf_version}
%{__make} install %{__make} install

View File

@ -36,12 +36,12 @@ cd ..
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif %endif
CFLAGS="$TB_OPT_FLAGS" \ CFLAGS="$SB_OPT_FLAGS" \
./configure \ ./configure \
--build=%{_build} --host=%{_host} \ --build=%{_build} --host=%{_host} \
--verbose --disable-nls \ --verbose --disable-nls \
--without-included-gettext \ --without-included-gettext \
--prefix=$TB_TMPPREFIX --prefix=$SB_TMPPREFIX
%{__make} %{?_smp_mflags} all %{__make} %{?_smp_mflags} all
@ -49,7 +49,7 @@ cd ..
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
rm -rf $TB_BUILD_ROOT rm -rf $SB_BUILD_ROOT
cd automake-%{automake_version} cd automake-%{automake_version}
%{__make} install %{__make} install

View File

@ -34,7 +34,7 @@ cd ..
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif %endif
CFLAGS="$TB_OPT_FLAGS" \ CFLAGS="$SB_OPT_FLAGS" \
../binutils-%{binutils_version}/configure \ ../binutils-%{binutils_version}/configure \
--build=%{_build} --host=%{_host} \ --build=%{_build} --host=%{_host} \
--target=%{_target} \ --target=%{_target} \
@ -52,35 +52,35 @@ cd ..
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
rm -rf $TB_BUILD_ROOT rm -rf $SB_BUILD_ROOT
cd build cd build
%{__make} DESTDIR=$TB_BUILD_ROOT install %{__make} DESTDIR=$SB_BUILD_ROOT install
# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
rm -rf $TB_BUILD_ROOT%{_infodir}/configure.info* rm -rf $SB_BUILD_ROOT%{_infodir}/configure.info*
rm -f $TB_BUILD_ROOT%{_infodir}/dir rm -f $SB_BUILD_ROOT%{_infodir}/dir
touch $TB_BUILD_ROOT%{_infodir}/dir touch $SB_BUILD_ROOT%{_infodir}/dir
# binutils does not install share/locale, however it uses it # binutils does not install share/locale, however it uses it
mkdir -p $TB_BUILD_ROOT%{_prefix}/share/locale mkdir -p $SB_BUILD_ROOT%{_prefix}/share/locale
# We don't ship host files # We don't ship host files
rm -f ${TB_BUILD_ROOT}%{_libdir}/libiberty* rm -f ${SB_BUILD_ROOT}%{_libdir}/libiberty*
# manpages without corresponding tools # manpages without corresponding tools
if test ! -f ${TB_BUILD_ROOT}%{_bindir}/%{_target}-dlltool%{_exeext}; then if test ! -f ${SB_BUILD_ROOT}%{_bindir}/%{_target}-dlltool%{_exeext}; then
rm -f ${TB_BUILD_ROOT}%{_mandir}/man1/%{_target}-dlltool* rm -f ${SB_BUILD_ROOT}%{_mandir}/man1/%{_target}-dlltool*
fi fi
if test ! -f ${TB_BUILD_ROOT}%{_bindir}/%{_target}-nlmconv%{_exeext}; then if test ! -f ${SB_BUILD_ROOT}%{_bindir}/%{_target}-nlmconv%{_exeext}; then
rm -f ${TB_BUILD_ROOT}%{_mandir}/man1/%{_target}-nlmconv* rm -f ${SB_BUILD_ROOT}%{_mandir}/man1/%{_target}-nlmconv*
fi fi
if test ! -f ${TB_BUILD_ROOT}%{_bindir}/%{_target}-windres%{_exeext}; then if test ! -f ${SB_BUILD_ROOT}%{_bindir}/%{_target}-windres%{_exeext}; then
rm -f ${TB_BUILD_ROOT}%{_mandir}/man1/%{_target}-windres* rm -f ${SB_BUILD_ROOT}%{_mandir}/man1/%{_target}-windres*
fi fi
if test ! -f ${TB_BUILD_ROOT}%{_bindir}/%{_target}-windmc%{_exeext}; then if test ! -f ${SB_BUILD_ROOT}%{_bindir}/%{_target}-windmc%{_exeext}; then
rm -f ${TB_BUILD_ROOT}%{_mandir}/man1/%{_target}-windmc* rm -f ${SB_BUILD_ROOT}%{_mandir}/man1/%{_target}-windmc*
fi fi
cd .. cd ..

View File

@ -35,7 +35,7 @@ cd ..
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif %endif
CFLAGS="$TB_OPT_FLAGS" \ CFLAGS="$SB_OPT_FLAGS" \
./configure \ ./configure \
--build=%{_build} --host=%{_host} \ --build=%{_build} --host=%{_host} \
--verbose --disable-nls \ --verbose --disable-nls \
@ -51,9 +51,9 @@ cd ..
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
rm -rf $TB_BUILD_ROOT rm -rf $SB_BUILD_ROOT
cd expat-%{expat_version} cd expat-%{expat_version}
%{__make} DESTDIR=$TB_BUILD_ROOT install %{__make} DESTDIR=$SB_BUILD_ROOT install
cd .. cd ..

View File

@ -112,10 +112,10 @@ Source22: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
%endif %endif
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
CC="%{_host}-gcc ${TB_OPT_FLAGS}" \ CC="%{_host}-gcc ${SB_OPT_FLAGS}" \
%else %else
# gcc is not ready to be compiled with -std=gnu99 # gcc is not ready to be compiled with -std=gnu99
CC=$(echo "%{__cc} ${TB_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ CC=$(echo "%{__cc} ${SB_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \
%endif %endif
../gcc-%{gcc_version}/configure \ ../gcc-%{gcc_version}/configure \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
@ -155,21 +155,21 @@ Source22: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
rm -rf $TB_BUILD_ROOT rm -rf $SB_BUILD_ROOT
cd build cd build
%{__make} DESTDIR=$TB_BUILD_ROOT install %{__make} DESTDIR=$SB_BUILD_ROOT install
cd .. cd ..
# libiberty doesn't honor --libdir, but always installs to a # libiberty doesn't honor --libdir, but always installs to a
# magically guessed _libdir # magically guessed _libdir
rm -f ${TB_BUILD_ROOT}%{_libdir}/libiberty.a rm -f ${SB_BUILD_ROOT}%{_libdir}/libiberty.a
# We use the version from binutils # We use the version from binutils
rm -f $TB_BUILD_ROOT%{_bindir}/%{_target}-c++filt%{_exeext} rm -f $SB_BUILD_ROOT%{_bindir}/%{_target}-c++filt%{_exeext}
# We don't ship info/dir # We don't ship info/dir
rm -f $TB_BUILD_ROOT%{_infodir}/dir rm -f $SB_BUILD_ROOT%{_infodir}/dir
# Don't want libffi's man-pages # Don't want libffi's man-pages
rm -f $TB_BUILD_ROOT%{_mandir}/man3/*ffi* rm -f $SB_BUILD_ROOT%{_mandir}/man3/*ffi*

View File

@ -33,7 +33,7 @@ cd ..
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif %endif
CFLAGS="$TB_OPT_FLAGS" \ CFLAGS="$SB_OPT_FLAGS" \
../gdb-%{gdb_version}/configure \ ../gdb-%{gdb_version}/configure \
--build=%{_build} --host=%{_host} \ --build=%{_build} --host=%{_host} \
--target=%{_target} \ --target=%{_target} \
@ -54,15 +54,15 @@ cd ..
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
rm -rf $TB_BUILD_ROOT rm -rf $SB_BUILD_ROOT
cd build cd build
%{__make} DESTDIR=$TB_BUILD_ROOT install %{__make} DESTDIR=$SB_BUILD_ROOT install
# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. # Dropped in FSF-binutils-2.9.5, but Cygwin still ships it.
rm -rf $TB_BUILD_ROOT%{_infodir}/configure.info* rm -rf $SB_BUILD_ROOT%{_infodir}/configure.info*
rm -f $TB_BUILD_ROOT%{_infodir}/dir rm -f $SB_BUILD_ROOT%{_infodir}/dir
touch $TB_BUILD_ROOT%{_infodir}/dir touch $SB_BUILD_ROOT%{_infodir}/dir
cd .. cd ..

View File

@ -36,7 +36,7 @@ cd ..
%if "%{_build}" != "%{_host}" %if "%{_build}" != "%{_host}"
CFLAGS_FOR_BUILD="-g -O2 -Wall" \ CFLAGS_FOR_BUILD="-g -O2 -Wall" \
%endif %endif
CFLAGS="$TB_OPT_FLAGS" \ CFLAGS="$SB_OPT_FLAGS" \
./configure \ ./configure \
--build=%{_build} --host=%{_host} \ --build=%{_build} --host=%{_host} \
--verbose --disable-nls \ --verbose --disable-nls \
@ -52,9 +52,9 @@ cd ..
%install %install
export PATH="%{_bindir}:${PATH}" export PATH="%{_bindir}:${PATH}"
rm -rf $TB_BUILD_ROOT rm -rf $SB_BUILD_ROOT
cd libusb-%{libusb_version} cd libusb-%{libusb_version}
%{__make} DESTDIR=$TB_BUILD_ROOT install %{__make} DESTDIR=$SB_BUILD_ROOT install
cd .. cd ..