Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-split-qt5 grimoire by Treeve Jelbert (74b1da596cbcf51035e73f17822a444c974f1319)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-split-qt5 grimoire by Treeve Jelbert (74b1da596cbcf51035e73f17822a444c974f1319)
  • Date: Tue, 12 Feb 2013 09:51:24 -0600

GIT changes to devel-split-qt5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog | 1 +
FUNCTIONS | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 74b1da596cbcf51035e73f17822a444c974f1319
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

fix qt5 build with multiple versions of python

diff --git a/ChangeLog b/ChangeLog
index 7d7a3fa..bda352d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
2013-02-12 Treeve Jelbert <treeve AT sourcemage.org>
* FUNCTIONS, qt5/FUNCTIONS: move qt5build to global level
+ fix use with multiple version of python

2013-02-10 Sukneet Basuta <sukneet AT sourcemage.org>
* audio-libs/sbc: new spell, Bluetooth Subband Codec (SBC) library
diff --git a/FUNCTIONS b/FUNCTIONS
index 573d06a..2ab884b 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -7,7 +7,8 @@ qt5_build() {
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
cd $SOURCE_DIRECTORY &&
QMAKEPATH="$QT5DIR/bin"
- PATH="$QMAKEPATH:$PATH"
+# in some cases, we set a symlink to python in the source directory
+ PATH="$QMAKEPATH:$SOURCE_DIRECTORY:$PATH"
qmake $OPTS *.pro &&
make
}



  • [SM-Commit] GIT changes to devel-split-qt5 grimoire by Treeve Jelbert (74b1da596cbcf51035e73f17822a444c974f1319), Treeve Jelbert, 02/12/2013

Archive powered by MHonArc 2.6.24.

Top of Page