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 DD91E1381FA for ; Wed, 4 Jun 2014 00:14:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6E0FE0B13; Wed, 4 Jun 2014 00:14:00 +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 1D5D4E0B1B for ; Wed, 4 Jun 2014 00:14:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19FE233FD44 for ; Wed, 4 Jun 2014 00:13:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id F16D4181A9 for ; Wed, 4 Jun 2014 00:13:56 +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: <1401837760.fc8ff562a0f85889729e08c98aee4efd0fdc0881.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: fc8ff562a0f85889729e08c98aee4efd0fdc0881 X-VCS-Branch: master Date: Wed, 4 Jun 2014 00:13:56 +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: 7bef7f6f-fc3f-4fc9-a37a-6eda431b0734 X-Archives-Hash: 22d4352ef726adf103efd6ddc6fa6bb8 commit: fc8ff562a0f85889729e08c98aee4efd0fdc0881 Author: Davide Pesavento gentoo org> AuthorDate: Tue Jun 3 23:22:40 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jun 3 23:22:40 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fc8ff562 [qt4-build-multilib.eclass] Don't bother fixing .la files, they'll be pruned later. --- eclass/qt4-build-multilib.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass index 5511995..5eef7f7 100644 --- a/eclass/qt4-build-multilib.eclass +++ b/eclass/qt4-build-multilib.eclass @@ -637,11 +637,11 @@ qt4_symlink_tools_to_build_dir() { # @FUNCTION: fix_library_files # @INTERNAL # @DESCRIPTION: -# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and +# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and # moves the *.pc files into the pkgconfig directory. fix_library_files() { local libfile - for libfile in "${D}"/${QT4_LIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do + for libfile in "${D}"/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do if [[ -e ${libfile} ]]; then sed -i -e "s:${S}/lib:${QT4_LIBDIR}:g" ${libfile} || die "sed on ${libfile} failed" fi