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

Merge pull request #4 from davehome/master

Browse source 
Some fixes for the mingw-w64-{crt,gcc} packages.
This commit is contained in:
Juan RP 2011-07-19 01:39:46 -07:00
parent 4e215d0529 d0603fddd8
commit f79e97b400
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
srcpkgs/mingw-w64-crt/template
View file

@ -36,7 +36,7 @@ else
_multilib_args="--enable-lib32 --disable-lib64" _multilib_args="--enable-lib32 --disable-lib64"
fi fi
strip_cmd=${_mingwtriplet}-strip strip_cmd=${_mingwprefix}/bin/${_mingwtriplet}-strip
do_build() do_build()
{ {
@ -46,7 +46,9 @@ do_build()
cd ${wrksrc}/../$_shortname-v$_majversion-$_snapshot/$pkgname && \ cd ${wrksrc}/../$_shortname-v$_majversion-$_snapshot/$pkgname && \
./configure --prefix=${_mingwprefix} --with-sysroot=${_mingwprefix} \ ./configure --prefix=${_mingwprefix} --with-sysroot=${_mingwprefix} \
--host=${_mingwtriplet} ${_multilib_args} --bindir=${_mingwprefix}/bin --host=${_mingwtriplet} ${_multilib_args} \
--bindir=${_mingwprefix}/bin --libdir=${_mingwprefix}/lib \
--libexecdir=${_mingwprefix}/lib
make ${makejobs} make ${makejobs}
@ -55,6 +57,13 @@ do_build()
do_install() do_install()
{ {
# This path setting is necessary so that it finds ${_mingwprefix}-ranlib
unset LD_LIBRARY_PATH LDLIBPATH LDFLAGS CPPFLAGS
local SAVEDPATH=$PATH
export PATH="/opt/bin:/usr/local/bin:/usr/local/sbin:/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
cd ${wrksrc}/../$_shortname-v$_majversion-$_snapshot/$pkgname && \ cd ${wrksrc}/../$_shortname-v$_majversion-$_snapshot/$pkgname && \
make DESTDIR=${DESTDIR} install make DESTDIR=${DESTDIR} install
export PATH=$SAVEDPATH
} }

8
srcpkgs/mingw-w64-gcc/template
View file

@ -3,6 +3,7 @@
pkgname=mingw-w64-gcc pkgname=mingw-w64-gcc
_majorver=4.6 _majorver=4.6
version=${_majorver}.1 version=${_majorver}.1
revision=1
distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2 distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2
build_style=custom-install build_style=custom-install
short_desc="The GNU C Compiler (for mingw-w64)" short_desc="The GNU C Compiler (for mingw-w64)"
@ -25,7 +26,10 @@ Add_dependency run mpc
Add_dependency run mpfr Add_dependency run mpfr
Add_dependency run zlib Add_dependency run zlib
Add_dependency build gcc-multilib if [ "${xbps_machine}" = "x86_64" ]; then
Add_dependency build gcc-multilib
fi
Add_dependency build flex Add_dependency build flex
Add_dependency build gawk Add_dependency build gawk
@ -71,7 +75,7 @@ do_build()
--with-system-zlib --enable-static --disable-shared --enable-lto \ --with-system-zlib --enable-static --disable-shared --enable-lto \
--enable-linker-build-id --enable-gnu-unique-object \ --enable-linker-build-id --enable-gnu-unique-object \
--enable-checking=release --disable-nls --disable-bootstrap \ --enable-checking=release --disable-nls --disable-bootstrap \
--libdir=${_mingwprefix}/lib --libdir=${_mingwprefix}/lib --libexecdir=${_mingwprefix}/lib
make ${makejobs} all-gcc make ${makejobs} all-gcc