New commits:
commit f81493a3e8451f39fa43ffa0f63d86af651c8b80
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
glib2 fix build with python3
commit 17921cb801b85b4fc762acc265e7bba1068417e4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
swig: => 2.0.5
commit f0fd9b36da1a745091ee6923382125fa929eb713
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cups - depends PYTHON
commit 5727ed6401d1f2acc4c51906ce267baa8c21c054
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
cracklib - fix build with python3
commit 95bb0e300182eab250e46e07c36d3bfc41eecb1f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
python - allow choice as primary python
commit 9313bd9d9924aafa01b74185c93618e36dba566d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
python3: build fixes, extra depends
python3 - still needs PRE_BUILD
diff --git a/devel/python/BUILD b/devel/python/BUILD
index 87f5f71..cc28ab8 100755
--- a/devel/python/BUILD
+++ b/devel/python/BUILD
@@ -12,6 +12,11 @@ fi &&
default_build &&
# python -c 'print "(c)", "lynx"*3'
-make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT" &&
+# can only have one primary python, the others must be alt
+if [[ $PY2K == y ]]; then
+ make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+else
+ make altinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+fi &&
message "Fake stage complete, installing to real path.."
diff --git a/devel/python/CONFIGURE b/devel/python/CONFIGURE
index a962b5a..3470655 100755
--- a/devel/python/CONFIGURE
+++ b/devel/python/CONFIGURE
@@ -1,3 +1,5 @@
+config_query PY2K "Use Python 2 as primary version on the system?" y &&
+
config_query_option PYTHON_OPTS \
"Enable IPv6?" y \
"--enable-ipv6" \
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index ba544a9..d2154f3 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,6 @@
+2012-04-22 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE, BUILD: choose whether this primary pyhon
+
2012-04-12 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.7.3, SOURCE2_URL[0] updated, SECURITY_PATCH=2
diff --git a/devel/python3/BUILD b/devel/python3/BUILD
index 3d424c3..bfd0090 100755
--- a/devel/python3/BUILD
+++ b/devel/python3/BUILD
@@ -1,21 +1,12 @@
-OPTS="--enable-shared $PYTHON3_OPTS $OPTS" &&
-
-# The following file from kdebindings has a syntax error that
-# makes Python compilation fail
-local PYTHON_VERSION=`echo $VERSION|cut -d. -f1,2`
-if [[ -f $INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py ]]; then
- mkdir "$SOURCE_DIRECTORY/spell-tmp" &&
- mv "$INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py" \
- "$SOURCE_DIRECTORY/spell-tmp"
-fi &&
+OPTS="--enable-shared $PYTHON3_OPTS $OPTS" &&
EXTRA_CFLAGS="$CFLAGS" default_build &&
if [[ $PY3K == y ]]; then
# python3 -c 'print ("(c)", "lynx"*3)'
- make fullinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
-else
make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
+else
+ make altinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT"
fi &&
message "Fake stage complete, installing to real path.."
diff --git a/devel/python3/CONFIGURE b/devel/python3/CONFIGURE
index b990cdd..81a0a33 100755
--- a/devel/python3/CONFIGURE
+++ b/devel/python3/CONFIGURE
@@ -7,5 +7,5 @@ config_query_option PYTHON3_OPTS \
optional_depends -sub CXX gcc \
"--with-cxx-main=g++" \
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 221b4d3..fddd5f6 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,10 @@
+2012-04-21 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: set flags for expat
+ * CONFIGURE: use correct flags for thread support
+ * BUILD, INSTALL: remove use of pydcop.py
+ this is obsolete, from kde3 days
+ use altinstall, not fullinstall
+
2012-04-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.2.3, SECURITY_PATCH=1