From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 182EC138A1A for ; Sun, 18 Jan 2015 01:59:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BD3B1E08D9; Sun, 18 Jan 2015 01:59:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50D54E08D9 for ; Sun, 18 Jan 2015 01:59:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0783534069C for ; Sun, 18 Jan 2015 01:59:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 858C7FCED for ; Sun, 18 Jan 2015 01:59:18 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1421545951.8dba75abb1e95c531b0a76b44cc614728ced221b.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt4-build-multilib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 8dba75abb1e95c531b0a76b44cc614728ced221b X-VCS-Branch: master Date: Sun, 18 Jan 2015 01:59:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8caff789-c3e3-4f5b-bf5d-e9260dc6a5ef X-Archives-Hash: 8ae03e7abeb223f7daf5c8fedb916b35 commit: 8dba75abb1e95c531b0a76b44cc614728ced221b Author: Davide Pesavento gentoo org> AuthorDate: Sun Jan 18 01:52:31 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Jan 18 01:52:31 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8dba75ab [qt4-build-multilib.eclass] Sync. --- eclass/qt4-build-multilib.eclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index ab02459..f890469 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -36,7 +36,7 @@ case ${PV} in *) QT4_BUILD_TYPE="release" MY_P=qt-everywhere-opensource-src-${PV/_/-} - SRC_URI="http://download.qt-project.org/archive/qt/${PV%.*}/${PV}/${MY_P}.tar.gz" + SRC_URI="http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz" S=${WORKDIR}/${MY_P} ;; esac @@ -272,10 +272,14 @@ qt4_multilib_src_configure() { qt4_symlink_tools_to_build_dir - # toolchain setup - tc-export CC CXX OBJCOPY STRIP - export AR="$(tc-getAR) cqs" - export LD="$(tc-getCXX)" + # toolchain setup ('local -x' because of bug 532510) + local -x \ + AR="$(tc-getAR) cqs" \ + CC=$(tc-getCC) \ + CXX=$(tc-getCXX) \ + LD=$(tc-getCXX) \ + OBJCOPY=$(tc-getOBJCOPY) \ + STRIP=$(tc-getSTRIP) # convert tc-arch to the values supported by Qt local arch=