From eb06feccf1bb6adf5fad169ed32b6d9ce1114dab Mon Sep 17 00:00:00 2001 From: davehome Date: Thu, 21 Jul 2011 03:52:56 -0600 Subject: [PATCH] mingw-w64-*: Changed target vendor id for i686 to w64 -- w32 is incorrect. --- srcpkgs/mingw-w64-binutils/template | 6 +++--- srcpkgs/mingw-w64-crt/template | 4 ++-- srcpkgs/mingw-w64-gcc/template | 4 ++-- srcpkgs/mingw-w64-headers/template | 4 ++-- srcpkgs/mingw-w64-libgcc/template | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/srcpkgs/mingw-w64-binutils/template b/srcpkgs/mingw-w64-binutils/template index 00455d1bef..2bf5a2e7a4 100644 --- a/srcpkgs/mingw-w64-binutils/template +++ b/srcpkgs/mingw-w64-binutils/template @@ -1,7 +1,7 @@ # Template file for 'mingw-w64-binutils' pkgname=mingw-w64-binutils version=2.21.1 -revision=2 +revision=3 distfiles="${GNU_SITE}/binutils/binutils-$version.tar.bz2" build_style=custom-install short_desc="GNU binary utilities (mingw-w64 version)" @@ -43,7 +43,7 @@ do_build() _target_args="--enable-targets=${_mingwtriplet},i686-w64-mingw32" _multilib_args="--enable-multilib --enable-64-bit-bfd" else - _mingwtriplet="${xbps_machine}-w32-mingw32" + _mingwtriplet="${xbps_machine}-w64-mingw32" _target_args="--enable-targets=${_mingwtriplet}" _multilib_args="--disable-multilib" fi @@ -71,7 +71,7 @@ do_install() if [ "${xbps_machine}" = "x86_64" ]; then _mingwtriplet="${xbps_machine}-w64-mingw32" else - _mingwtriplet="${xbps_machine}-w32-mingw32" + _mingwtriplet="${xbps_machine}-w64-mingw32" fi # The mingw-w64 faq advises to create a symlink here diff --git a/srcpkgs/mingw-w64-crt/template b/srcpkgs/mingw-w64-crt/template index d3aaf8ed36..33ce89c0d6 100644 --- a/srcpkgs/mingw-w64-crt/template +++ b/srcpkgs/mingw-w64-crt/template @@ -5,7 +5,7 @@ pkgname=${_shortname}-crt _majversion=1.0 _snapshot=20110523 version=${_majversion}.${_snapshot} -revision=2 +revision=3 distfiles=${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2 build_style=custom-install short_desc="The mingw-w64 cross-compiler runtime" @@ -35,7 +35,7 @@ if [ "${xbps_machine}" = "x86_64" ]; then _mingwtriplet="${xbps_machine}-w64-mingw32" _multilib_args="--enable-lib32 --enable-lib64" else - _mingwtriplet="${xbps_machine}-w32-mingw32" + _mingwtriplet="${xbps_machine}-w64-mingw32" _multilib_args="--enable-lib32 --disable-lib64" fi diff --git a/srcpkgs/mingw-w64-gcc/template b/srcpkgs/mingw-w64-gcc/template index 8b5276f832..a362539fb2 100644 --- a/srcpkgs/mingw-w64-gcc/template +++ b/srcpkgs/mingw-w64-gcc/template @@ -3,7 +3,7 @@ pkgname=mingw-w64-gcc _majorver=4.6 version=${_majorver}.1 -revision=4 +revision=5 distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2 build_style=custom-install 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" else _triplet="${xbps_machine}-pc-linux-gnu" - _mingwtriplet="${xbps_machine}-w32-mingw32" + _mingwtriplet="${xbps_machine}-w64-mingw32" _multilib_args="--disable-multilib --disable-64bit --enable-32bit" fi diff --git a/srcpkgs/mingw-w64-headers/template b/srcpkgs/mingw-w64-headers/template index 16ef85601e..931627fb3c 100644 --- a/srcpkgs/mingw-w64-headers/template +++ b/srcpkgs/mingw-w64-headers/template @@ -4,7 +4,7 @@ pkgname=${_shortname}-headers _majversion=1.0 _snapshot=20110523 version=${_majversion}.${_snapshot} -revision=1 +revision=2 distfiles="${SOURCEFORGE_SITE}/${_shortname}/${_shortname}/${_shortname}-v${_majversion}-snapshot-${_snapshot}.tar.bz2" build_style=custom-install short_desc="mingw-w64 headers, psdk, directx sdk" @@ -38,7 +38,7 @@ do_build() _mingwtriplet="${xbps_machine}-w64-mingw32" _build_args="--build=${xbps_machine}-unknown-linux-gnu" else - _mingwtriplet="${xbps_machine}-w32-mingw32" + _mingwtriplet="${xbps_machine}-w64-mingw32" _build_args="--build=${xbps_machine}-pc-linux-gnu" fi diff --git a/srcpkgs/mingw-w64-libgcc/template b/srcpkgs/mingw-w64-libgcc/template index cf1be38b9d..77e6c6c86d 100644 --- a/srcpkgs/mingw-w64-libgcc/template +++ b/srcpkgs/mingw-w64-libgcc/template @@ -3,7 +3,7 @@ pkgname=mingw-w64-libgcc _majorver=4.6 version=${_majorver}.1 -revision=1 +revision=2 distfiles=http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2 build_style=custom-install 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" else _triplet="${xbps_machine}-pc-linux-gnu" - _mingwtriplet="${xbps_machine}-w32-mingw32" + _mingwtriplet="${xbps_machine}-w64-mingw32" _multilib_args="--disable-multilib --disable-64bit --enable-32bit" fi