[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a86be9dbff466d3f9f2e7f8376bc08d4764af581)

Vlad Glagolev scm at sourcemage.org
Mon Aug 22 07:08:16 EDT 2011


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 devel/swig/HISTORY       |    2 ++
 devel/swig/PRE_BUILD     |    7 +++++++
 devel/swig/python3.patch |   11 +++++++++++
 3 files changed, 20 insertions(+)

New commits:
commit a86be9dbff466d3f9f2e7f8376bc08d4764af581
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    swig: fixed python3 build

diff --git a/devel/swig/HISTORY b/devel/swig/HISTORY
index f4a39bc..022f76c 100644
--- a/devel/swig/HISTORY
+++ b/devel/swig/HISTORY
@@ -2,6 +2,8 @@
 	* DETAILS: updated spell to 2.0.4; quoting paths
 	* {PRE_,}SUB_DEPENDS: added Python 3 support
 	* REPAIR^all^PRE_SUB_DEPENDS: repair PRE_SUB_DEPENDS
+	* PRE_BUILD: added, to apply the patch
+	* python3.patch: added, to correctly find python3 build library path
 
 2011-07-30 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
 	* DEPENDS: changed dependency on g++ to dependency on gcc with
diff --git a/devel/swig/PRE_BUILD b/devel/swig/PRE_BUILD
new file mode 100755
index 0000000..b0d0a72
--- /dev/null
+++ b/devel/swig/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if is_depends_enabled $SPELL python3; then
+  patch -p0 < "$SPELL_DIRECTORY/python3.patch" &&
+  ./autogen.sh
+fi
diff --git a/devel/swig/python3.patch b/devel/swig/python3.patch
new file mode 100644
index 0000000..c9faa15
--- /dev/null
+++ b/devel/swig/python3.patch
@@ -0,0 +1,11 @@
+--- configure.in.orig	2011-04-02 02:56:58.000000000 +0400
++++ configure.in	2011-08-22 14:09:06.399907766 +0400
+@@ -785,7 +785,7 @@
+ 
+     # Set the library directory blindly.   This probably won't work with older versions
+     AC_MSG_CHECKING([for Python 3.x library])
+-    dirs="$PY3VERSION/config $PY3VERSION/$PY3LIBDIR python/$PY3LIBDIR"
++    dirs="$PY3VERSION/config-${PY3VERSION/python/}m $PY3VERSION/$PY3LIBDIR python/$PY3LIBDIR"
+     for i in $dirs; do
+         if test -d $PY3EPREFIX/$PY3LIBDIR/$i; then
+            PY3LIB="$PY3EPREFIX/$PY3LIBDIR/$i"


More information about the SM-Commit mailing list