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

Merge pull request #8 from davehome/master

Browse source 
mingw-w64-*: Changed target vendor id for i686 to w64 -- w32 is incorrect.
This commit is contained in:
Juan RP 2011-07-21 04:07:39 -07:00
commit d00adf5893
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/mingw-w64-binutils/template
View file

@ -1,7 +1,7 @@
# Template file for 'mingw-w64-binutils' # Template file for 'mingw-w64-binutils'
pkgname=mingw-w64-binutils pkgname=mingw-w64-binutils
version=2.21.1 version=2.21.1
revision=2 revision=3
distfiles="${GNU_SITE}/binutils/binutils-$version.tar.bz2" distfiles="${GNU_SITE}/binutils/binutils-$version.tar.bz2"
build_style=custom-install build_style=custom-install
short_desc="GNU binary utilities (mingw-w64 version)" short_desc="GNU binary utilities (mingw-w64 version)"
@ -43,7 +43,7 @@ do_build()
_target_args="--enable-targets=${_mingwtriplet},i686-w64-mingw32" _target_args="--enable-targets=${_mingwtriplet},i686-w64-mingw32"
_multilib_args="--enable-multilib --enable-64-bit-bfd" _multilib_args="--enable-multilib --enable-64-bit-bfd"
else else
_mingwtriplet="${xbps_machine}-w32-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
_target_args="--enable-targets=${_mingwtriplet}" _target_args="--enable-targets=${_mingwtriplet}"
_multilib_args="--disable-multilib" _multilib_args="--disable-multilib"
fi fi
@ -71,7 +71,7 @@ do_install()
if [ "${xbps_machine}" = "x86_64" ]; then if [ "${xbps_machine}" = "x86_64" ]; then
_mingwtriplet="${xbps_machine}-w64-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
else else
_mingwtriplet="${xbps_machine}-w32-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
fi fi
# The mingw-w64 faq advises to create a symlink here # The mingw-w64 faq advises to create a symlink here

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

@ -5,7 +5,7 @@ pkgname=${_shortname}-crt
_majversion=1.0 _majversion=1.0
_snapshot=20110523 _snapshot=20110523
version=${_majversion}.${_snapshot} version=${_majversion}.${_snapshot}
revision=2 revision=3
distfiles=${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2 distfiles=${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2
build_style=custom-install build_style=custom-install
short_desc="The mingw-w64 cross-compiler runtime" short_desc="The mingw-w64 cross-compiler runtime"
@ -35,7 +35,7 @@ if [ "${xbps_machine}" = "x86_64" ]; then
_mingwtriplet="${xbps_machine}-w64-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
_multilib_args="--enable-lib32 --enable-lib64" _multilib_args="--enable-lib32 --enable-lib64"
else else
_mingwtriplet="${xbps_machine}-w32-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
_multilib_args="--enable-lib32 --disable-lib64" _multilib_args="--enable-lib32 --disable-lib64"
fi fi

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

@ -3,7 +3,7 @@
pkgname=mingw-w64-gcc pkgname=mingw-w64-gcc
_majorver=4.6 _majorver=4.6
version=${_majorver}.1 version=${_majorver}.1
revision=4 revision=5
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)"
@ -44,7 +44,7 @@ if [ "${xbps_machine}" = "x86_64" ]; then
_multilib_args="${_multilib_args} --enable-64bit --enable-32bit" _multilib_args="${_multilib_args} --enable-64bit --enable-32bit"
else else
_triplet="${xbps_machine}-pc-linux-gnu" _triplet="${xbps_machine}-pc-linux-gnu"
_mingwtriplet="${xbps_machine}-w32-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
_multilib_args="--disable-multilib --disable-64bit --enable-32bit" _multilib_args="--disable-multilib --disable-64bit --enable-32bit"
fi fi

4
srcpkgs/mingw-w64-headers/template
View file

@ -4,7 +4,7 @@ pkgname=${_shortname}-headers
_majversion=1.0 _majversion=1.0
_snapshot=20110523 _snapshot=20110523
version=${_majversion}.${_snapshot} version=${_majversion}.${_snapshot}
revision=1 revision=2
distfiles="${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2" distfiles="${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2"
build_style=custom-install build_style=custom-install
short_desc="mingw-w64 headers, psdk, directx sdk" short_desc="mingw-w64 headers, psdk, directx sdk"
@ -38,7 +38,7 @@ do_build()
_mingwtriplet="${xbps_machine}-w64-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
_build_args="--build=${xbps_machine}-unknown-linux-gnu" _build_args="--build=${xbps_machine}-unknown-linux-gnu"
else else
_mingwtriplet="${xbps_machine}-w32-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
_build_args="--build=${xbps_machine}-pc-linux-gnu" _build_args="--build=${xbps_machine}-pc-linux-gnu"
fi fi

4
srcpkgs/mingw-w64-libgcc/template
View file

@ -3,7 +3,7 @@
pkgname=mingw-w64-libgcc pkgname=mingw-w64-libgcc
_majorver=4.6 _majorver=4.6
version=${_majorver}.1 version=${_majorver}.1
revision=1 revision=2
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 (libs for mingw-w64)" short_desc="The GNU C Compiler (libs for mingw-w64)"
@ -45,7 +45,7 @@ if [ "${xbps_machine}" = "x86_64" ]; then
_multilib_args="${_multilib_args} --enable-64bit --enable-32bit" _multilib_args="${_multilib_args} --enable-64bit --enable-32bit"
else else
_triplet="${xbps_machine}-pc-linux-gnu" _triplet="${xbps_machine}-pc-linux-gnu"
_mingwtriplet="${xbps_machine}-w32-mingw32" _mingwtriplet="${xbps_machine}-w64-mingw32"
_multilib_args="--disable-multilib --disable-64bit --enable-32bit" _multilib_args="--disable-multilib --disable-64bit --enable-32bit"
fi fi