jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chroot-gcc: fix bootstrap build.

Browse source
This commit is contained in:
Juan RP 2013-04-17 14:51:25 +02:00
parent 706231fd27
commit 3b4ffdabfc
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
srcpkgs/chroot-gcc/template
View file

@ -51,9 +51,11 @@ _gmp_build() {
cd gmp-build cd gmp-build
[ -f .gmp_build_done ] && return [ -f .gmp_build_done ] && return
../gmp-${_gmp_ver}/configure \ if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
${CONFIGURE_SHARED_ARGS} --prefix=${wrksrc}/buildtmp \ export ABI=32
--disable-shared --enable-static fi
../gmp-${_gmp_ver}/configure --prefix=${wrksrc}/buildtmp \
--disable-shared --enable-static "$@"
make ${makejobs} make ${makejobs}
make install make install
@ -69,10 +71,9 @@ _mpfr_build() {
cd mpfr-build cd mpfr-build
[ -f .mpfr_build_done ] && return [ -f .mpfr_build_done ] && return
../mpfr-${_mpfr_ver}/configure \ ../mpfr-${_mpfr_ver}/configure --prefix=${wrksrc}/buildtmp \
${CONFIGURE_SHARED_ARGS} --prefix=${wrksrc}/buildtmp \
--with-gmp=${wrksrc}/buildtmp \ --with-gmp=${wrksrc}/buildtmp \
--disable-shared --enable-static --disable-shared --enable-static "$@"
make ${makejobs} make ${makejobs}
make install make install
@ -88,11 +89,10 @@ _mpc_build() {
cd mpc-build cd mpc-build
[ -f .mpc_build_done ] && return [ -f .mpc_build_done ] && return
../mpc-${_mpc_ver}/configure \ ../mpc-${_mpc_ver}/configure --prefix=${wrksrc}/buildtmp \
${CONFIGURE_SHARED_ARGS} --prefix=${wrksrc}/buildtmp \
--with-gmp=${wrksrc}/buildtmp \ --with-gmp=${wrksrc}/buildtmp \
--with-mpfr=${wrksrc}/buildtmp \ --with-mpfr=${wrksrc}/buildtmp \
--disable-shared --enable-static --disable-shared --enable-static "$@"
make ${makejobs} make ${makejobs}
make install make install
@ -111,9 +111,6 @@ do_configure() {
if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then if [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then
_floatabi="--with-float=hard" _floatabi="--with-float=hard"
elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# Required by gmp
export ABI=32
fi fi
if [ "$CROSS_BUILD" ]; then if [ "$CROSS_BUILD" ]; then
@ -127,9 +124,9 @@ do_configure() {
export CXXFLAGS="$CFLAGS" export CXXFLAGS="$CFLAGS"
fi fi
_gmp_build _gmp_build ${_args}
_mpfr_build _mpfr_build ${_args}
_mpc_build _mpc_build ${_args}
cd ${wrksrc} cd ${wrksrc}
[ ! -d gcc-build ] && mkdir gcc-build [ ! -d gcc-build ] && mkdir gcc-build