From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SeDn7-00042V-8W for garchives@archives.gentoo.org; Mon, 11 Jun 2012 23:12:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCB72E0486; Mon, 11 Jun 2012 23:12:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8B7E5E0486 for ; Mon, 11 Jun 2012 23:12:48 +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 BC7181B400D for ; Mon, 11 Jun 2012 23:12:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 84EC2E5430 for ; Mon, 11 Jun 2012 23:12:44 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1339456269.6750c20a16901a1155af5afc3cb7d22830cbe3fe.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 6750c20a16901a1155af5afc3cb7d22830cbe3fe X-VCS-Branch: master Date: Mon, 11 Jun 2012 23:12:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9081f70d-dae4-4ad7-9689-e3f7b55d5872 X-Archives-Hash: 69cd91b5306f283e38f3e797f3d7d02e commit: 6750c20a16901a1155af5afc3cb7d22830cbe3fe Author: Davide Pesavento gmail com> AuthorDate: Mon Jun 11 23:11:09 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon Jun 11 23:11:09 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D6750c20a [qt5-build.eclass] Pass CONFIG+=3Dnostrip to qmake. --- eclass/qt5-build.eclass | 22 +++++++++------------- 1 files changed, 9 insertions(+), 13 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index b1af0e9..9e90c2a 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -189,12 +189,9 @@ qt5-build_src_prepare() { # TODO # in compile.test, -m flags are passed to the linker via LIBS =20 - # Respect C/C++ compiler - tc-export CC CXX + tc-export CC CXX RANLIB STRIP # qmake-generated Makefiles use LD/LINK for linking export LD=3D"$(tc-getCXX)" - # Don't strip binaries - export STRIP=3D":" =20 base_src_prepare } @@ -260,15 +257,14 @@ qt5-build_src_configure() { "${S}"/configure "${conf[@]}" || die "configure failed" popd >/dev/null || die =20 - if [[ ${PN} !=3D "qt-core" ]]; then - qmake() { - "${QT5_BUILD_DIR}"/bin/qmake \ - "${S}/${subdir}/${subdir##*/}.pro" \ - QMAKE_LIBDIR_QT=3D"${QTLIBDIR}" \ - || die - } - qt5_foreach_target_subdir qmake - fi + qmake() { + "${QT5_BUILD_DIR}"/bin/qmake \ + "${S}/${subdir}/${subdir##*/}.pro" \ + QMAKE_LIBDIR_QT=3D"${QTLIBDIR}" \ + CONFIG+=3Dnostrip \ + || die + } + qt5_foreach_target_subdir qmake } =20 # @FUNCTION: qt5-build_src_compile