Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3cedb81d4e5b4bc0cf8e2a2b9dd7cfef029f6768)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3cedb81d4e5b4bc0cf8e2a2b9dd7cfef029f6768)
  • Date: Sat, 21 Mar 2015 05:22:24 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

libs/libxml2/BUILD | 7 +------
libs/libxml2/HISTORY | 3 +++
libs/pyqt4/BUILD | 2 +-
libs/pyqt4/HISTORY | 3 +++
libs/sip/BUILD | 2 ++
libs/sip/HISTORY | 3 +++
6 files changed, 13 insertions(+), 7 deletions(-)

New commits:
commit 3cedb81d4e5b4bc0cf8e2a2b9dd7cfef029f6768
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libxml2: unified $PYTHON

commit 3ad41e5624f25c907bbeff92ef3bf149fde9c15b
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

sip: today

commit b3706a713b732e7391c3cd9c20de8924c344a263
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

pyqt4: syntax fix

commit cbf48d6826e8809b94f2cfcc89fa6390020a28bb
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

sip: define $PYTHON to make it build

diff --git a/libs/libxml2/BUILD b/libs/libxml2/BUILD
index 10eb6b8..cc05257 100755
--- a/libs/libxml2/BUILD
+++ b/libs/libxml2/BUILD
@@ -1,7 +1,2 @@
-if is_depends_enabled $SPELL python3;then
- export PYTHON=/usr/bin/python3
-fi &&
-if is_depends_enabled $SPELL python;then
- export PYTHON=/usr/bin/python2.7
-fi &&
+export PYTHON=$(get_spell_provider_file $SPELL PYTHON
'/usr/bin/python[0-9\.]*$') &&
default_build
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index d0a1e12..3a8499a 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,6 @@
+2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: unified $PYTHON selection
+
2013-07-25 Treeve Jelbert <treeve AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: adjust to python3
* BUILD: added, fix detection of python3
diff --git a/libs/pyqt4/BUILD b/libs/pyqt4/BUILD
index bcc4082..93d5954 100755
--- a/libs/pyqt4/BUILD
+++ b/libs/pyqt4/BUILD
@@ -4,6 +4,6 @@ fi &&
export QTDIR=/usr &&
PATH=$QTDIR/bin/qt4:$PATH &&
# Need to use the proper selected python.
-PYTHON=$(get_spell_provider_file $SPELL PYTHON '/usr/bin/python[0-9\.]*$')
+PYTHON=$(get_spell_provider_file $SPELL PYTHON '/usr/bin/python[0-9\.]*$') &&
$PYTHON ./configure-ng.py --confirm-license $VBIG -j $MAKE_NJOBS &&
make
diff --git a/libs/pyqt4/HISTORY b/libs/pyqt4/HISTORY
index 18df94b..eceed90 100644
--- a/libs/pyqt4/HISTORY
+++ b/libs/pyqt4/HISTORY
@@ -1,3 +1,6 @@
+2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: missing &&
+
2015-03-20 Thomas Orgis <sobukus AT sourcemage.org>
* BUILD: actually look for the correct python, use correct
build script
diff --git a/libs/sip/BUILD b/libs/sip/BUILD
index a1db27a..1154ebb 100755
--- a/libs/sip/BUILD
+++ b/libs/sip/BUILD
@@ -1,3 +1,5 @@
sed -i "s/-O2//" specs/linux-g++ &&
+# Need to use the proper selected python.
+PYTHON=$(get_spell_provider_file $SPELL PYTHON '/usr/bin/python[0-9\.]*$') &&
$PYTHON ./configure.py CFLAGS_EXCEPTIONS_OFF=1 &&
make
diff --git a/libs/sip/HISTORY b/libs/sip/HISTORY
index eb9b2c9..8e53e35 100644
--- a/libs/sip/HISTORY
+++ b/libs/sip/HISTORY
@@ -1,3 +1,6 @@
+2015-03-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: fix build by defining $PYHTON
+
2014-12-28 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.16.5




  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (3cedb81d4e5b4bc0cf8e2a2b9dd7cfef029f6768), Thomas Orgis, 03/21/2015

Archive powered by MHonArc 2.6.24.

Top of Page