Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Tue, 02 Feb 2016 18:35:34
Message-Id: 1454438107.c7da64f9f51154616c452733673bc4247a08efec.pesa@gentoo
1 commit: c7da64f9f51154616c452733673bc4247a08efec
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 20 15:46:06 2016 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 18:35:07 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7da64f9
7
8 qt5-build.eclass: don't bother exporting DYLD_LIBRARY_PATH for tests
9
10 We don't support Gentoo Prefix anywhere else in the eclass.
11
12 (cherry picked from proj/qt commit dd2818af8e7fe12a3afca273c4c42f73403ad2ee)
13
14 eclass/qt5-build.eclass | 3 +--
15 1 file changed, 1 insertion(+), 2 deletions(-)
16
17 diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
18 index 381ae89..12aef9c 100644
19 --- a/eclass/qt5-build.eclass
20 +++ b/eclass/qt5-build.eclass
21 @@ -226,12 +226,11 @@ qt5-build_src_test() {
22 qt5_foreach_target_subdir emake
23
24 # create a custom testrunner script that correctly sets
25 - # {,DY}LD_LIBRARY_PATH before executing the given test
26 + # LD_LIBRARY_PATH before executing the given test
27 local testrunner=${QT5_BUILD_DIR}/gentoo-testrunner
28 cat > "${testrunner}" <<-_EOF_ || die
29 #!/bin/sh
30 export LD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
31 - export DYLD_LIBRARY_PATH="${QT5_BUILD_DIR}/lib:${QT5_LIBDIR}"
32 "\$@"
33 _EOF_
34 chmod +x "${testrunner}"