From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-521067-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id E24E5138200
	for <garchives@archives.gentoo.org>; Wed,  7 Nov 2012 03:12:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 67210E0330;
	Wed,  7 Nov 2012 03:12:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id DB502E0330
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Nov 2012 03:12:07 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 2D73833DD4C
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Nov 2012 03:12:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id B92BFE544D
	for <gentoo-commits@lists.gentoo.org>; Wed,  7 Nov 2012 03:12:05 +0000 (UTC)
From: "Davide Pesavento" <pesa@gentoo.org>
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" <pesa@gentoo.org>
Message-ID: <1352257764.43005bf367f592b38f5dddac7d43c35fedfbd968.pesa@gentoo>
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
X-VCS-Repository: proj/qt
X-VCS-Files: eclass/qt4-r2.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: pesa
X-VCS-Committer-Name: Davide Pesavento
X-VCS-Revision: 43005bf367f592b38f5dddac7d43c35fedfbd968
X-VCS-Branch: master
Date: Wed,  7 Nov 2012 03:12:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7d35f9ad-2685-489d-a324-6a8360a8724d
X-Archives-Hash: 6d417089ce9860493e27d85b62d51484

commit:     43005bf367f592b38f5dddac7d43c35fedfbd968
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Wed Nov  7 03:09:24 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 03:09:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=43005bf3

[qt4-r2.eclass] Properly define QMAKE_{AR,RANLIB,OBJCOPY}.

This should fix bug 440266 (and probably others too).

---
 eclass/qt4-r2.eclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/eclass/qt4-r2.eclass b/eclass/qt4-r2.eclass
index a35975c..5a906f9 100644
--- a/eclass/qt4-r2.eclass
+++ b/eclass/qt4-r2.eclass
@@ -244,9 +244,13 @@ eqmake4() {
 		-makefile \
 		QTDIR="${EPREFIX}"/usr/$(get_libdir) \
 		QMAKE="${EPREFIX}"/usr/bin/qmake \
+		QMAKE_AR="$(tc-getAR) cqs" \
 		QMAKE_CC="$(tc-getCC)" \
 		QMAKE_CXX="$(tc-getCXX)" \
 		QMAKE_LINK="$(tc-getCXX)" \
+		QMAKE_OBJCOPY="$(tc-getOBJCOPY)" \
+		QMAKE_RANLIB= \
+		QMAKE_STRIP= \
 		QMAKE_CFLAGS="${CFLAGS}" \
 		QMAKE_CFLAGS_RELEASE= \
 		QMAKE_CFLAGS_DEBUG= \
@@ -259,7 +263,6 @@ eqmake4() {
 		QMAKE_LIBDIR_QT="${EPREFIX}"/usr/$(get_libdir)/qt4 \
 		QMAKE_LIBDIR_X11="${EPREFIX}"/usr/$(get_libdir) \
 		QMAKE_LIBDIR_OPENGL="${EPREFIX}"/usr/$(get_libdir) \
-		QMAKE_STRIP= \
 		"${qmake_args[@]}"
 
 	# was qmake successful?