Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: eclass/
Date: Wed, 04 Jun 2014 00:14:01
Message-Id: 1401837760.fc8ff562a0f85889729e08c98aee4efd0fdc0881.pesa@gentoo
1 commit: fc8ff562a0f85889729e08c98aee4efd0fdc0881
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 3 23:22:40 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 3 23:22:40 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fc8ff562
7
8 [qt4-build-multilib.eclass] Don't bother fixing .la files, they'll be pruned later.
9
10 ---
11 eclass/qt4-build-multilib.eclass | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14 diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
15 index 5511995..5eef7f7 100644
16 --- a/eclass/qt4-build-multilib.eclass
17 +++ b/eclass/qt4-build-multilib.eclass
18 @@ -637,11 +637,11 @@ qt4_symlink_tools_to_build_dir() {
19 # @FUNCTION: fix_library_files
20 # @INTERNAL
21 # @DESCRIPTION:
22 -# Fixes the paths in *.la, *.prl, *.pc, as they are wrong due to sandbox and
23 +# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and
24 # moves the *.pc files into the pkgconfig directory.
25 fix_library_files() {
26 local libfile
27 - for libfile in "${D}"/${QT4_LIBDIR}/{*.la,*.prl,pkgconfig/*.pc}; do
28 + for libfile in "${D}"/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do
29 if [[ -e ${libfile} ]]; then
30 sed -i -e "s:${S}/lib:${QT4_LIBDIR}:g" ${libfile} || die "sed on ${libfile} failed"
31 fi