I wrote at 14:17 (EST):
> I am guessing (it's indeed a guess, but an educated one :) that
> python2.6 is close enough to python2.5 that it's merely a
> config-search issue.
XulChris came by IRC to say he'd tried that patch and it didn't work.
He gave this build log:
http://koji.fedoraproject.org/koji/getfile?taskID=964846&name=build.log
Here's another one, that I think is worth a try. I've attached two
versions: one for if you applied already the one I sent earlier tonight,
and another that is against trunk.
I apologize that we've hugely increased the edit-compile-test cycle on
this one. :) I don't have access to a Fedora machine with python2.6
installed. If someone can get it for me, I can probably solve this more
quickly.
autoreconf --install
once you've applied the patch.
This is r5094 of the quick-patch-devel branch. This patch is
copyrighted by me and is licensed GPLv3-or-later.
diff --git a/pypoker-eval/Makefile.am b/pypoker-eval/Makefile.am
index a9dbb9d..c16df82 100644
--- a/pypoker-eval/Makefile.am
+++ b/pypoker-eval/Makefile.am
@@ -1,11 +1,8 @@
#
# Copyright (C) 2007, 2008 Loic Dachary <[EMAIL PROTECTED]>
-# Copyright (C) 2004, 2005, 2006 Mekensleep
-#
-# Mekensleep
-# 24 rue vieille du temple
-# 75004 Paris
-# [EMAIL PROTECTED]
+# Copyright (C) 2008 Bradley M. Kuhn <[EMAIL PROTECTED]>
+# Copyright (C) 2004, 2005, 2006 Mekensleep <[EMAIL PROTECTED]>
+# 24 rue vieille du temple, 75004 Paris
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,6 +20,7 @@
#
# Authors:
# Loic Dachary <[EMAIL PROTECTED]>
+# Bradley M. Kuhn <[EMAIL PROTECTED]>
#
#
ACLOCAL_AMFLAGS = -I config
@@ -34,6 +32,14 @@ pythondir = ${pyexecdir}
python_PYTHON = \
pokereval.py
+if PYTHON_2_6
+py2_6exec_LTLIBRARIES = _pokereval_2_6.la
+_pokereval_2_6_la_SOURCES = pypokereval.c
+_pokereval_2_6_la_LDFLAGS = -module -no-undefined -version-info 1:0:0
+_pokereval_2_6_la_LIBADD = ${PYTHON2_6_LIBS} ${POKER_EVAL_LIBS}
+_pokereval_2_6_la_CFLAGS = ${PYTHON2_6_CFLAGS} ${POKER_EVAL_CFLAGS} -DPYTHON_VERSION=\"2_6\" -D'VERSION_NAME(w)=w\#\#2_6'
+endif
+
if PYTHON_2_5
py2_5exec_LTLIBRARIES = _pokereval_2_5.la
_pokereval_2_5_la_SOURCES = pypokereval.c
diff --git a/poker-network/ChangeLog b/poker-network/ChangeLog
index 359743a..78669e4 100644
--- a/poker-network/ChangeLog
+++ b/poker-network/ChangeLog
@@ -1,5 +1,9 @@
2008-11-30 Bradley M. Kuhn <[EMAIL PROTECTED]>
+ * config/python.m4 (AM_PATH_PYTHON): Added python2.6 support.
+
+ * config/ccpython.m4 (ALL_CC_PYTHON): Added python2.6 support.
+
* database/1.6.0-1.7.0.sql: en_US.UTF-8 is no longer default locale,
en_US by itself is.
diff --git a/poker-network/config/ccpython.m4 b/poker-network/config/ccpython.m4
index b5d2255..5b94d64 100644
--- a/poker-network/config/ccpython.m4
+++ b/poker-network/config/ccpython.m4
@@ -111,7 +111,7 @@ AM_CONDITIONAL([PYTHON_]$2, [test "$have_python" != "no"])
AC_DEFUN([ALL_CC_PYTHON],
[
-m4_define([_AM_PYTHON_INTERPRETER_LIST], [python2.5 python2.4 python2.3])
+m4_define([_AM_PYTHON_INTERPRETER_LIST], [python2.6 python2.5 python2.4 python2.3])
PYTHONS=''
found_one=''
_ONE_CC_PYTHON([=2.3], [2_3])
@@ -122,6 +122,9 @@ if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
unset PYTHON
_ONE_CC_PYTHON([=2.5], [2_5])
if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
+unset PYTHON
+_ONE_CC_PYTHON([=2.6], [2_6])
+if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
PYTHON=$found_one
if ! test "$found_one" ; then
AC_MSG_ERROR([No python development environments found])
diff --git a/poker-network/config/python.m4 b/poker-network/config/python.m4
index e11f501..fe8b022 100644
--- a/poker-network/config/python.m4
+++ b/poker-network/config/python.m4
@@ -42,7 +42,7 @@ AC_DEFUN([AM_PATH_PYTHON],
dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
dnl in 1.5.
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
- [python python2 python2.5 python2.4 python2.3 python2.2 dnl
+ [python python2 python2.6 python2.5 python2.4 python2.3 python2.2 dnl
python2.1 python2.0 python1.6 python1.5])
m4_if([$1],[],[
diff --git a/pypoker-eval/ChangeLog b/pypoker-eval/ChangeLog
index 5f924e0..be70540 100644
--- a/pypoker-eval/ChangeLog
+++ b/pypoker-eval/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-30 Bradley M. Kuhn <[EMAIL PROTECTED]>
+
+ * config/python.m4 (AM_PATH_PYTHON): Added python2.6 support.
+
+ * config/ccpython.m4 (ALL_CC_PYTHON): Added python2.6 support.
+
2008-03-01 Loic Dachary <[EMAIL PROTECTED]>
* Release 135.0
diff --git a/pypoker-eval/Makefile.am b/pypoker-eval/Makefile.am
index a9dbb9d..c16df82 100644
--- a/pypoker-eval/Makefile.am
+++ b/pypoker-eval/Makefile.am
@@ -1,11 +1,8 @@
#
# Copyright (C) 2007, 2008 Loic Dachary <[EMAIL PROTECTED]>
-# Copyright (C) 2004, 2005, 2006 Mekensleep
-#
-# Mekensleep
-# 24 rue vieille du temple
-# 75004 Paris
-# [EMAIL PROTECTED]
+# Copyright (C) 2008 Bradley M. Kuhn <[EMAIL PROTECTED]>
+# Copyright (C) 2004, 2005, 2006 Mekensleep <[EMAIL PROTECTED]>
+# 24 rue vieille du temple, 75004 Paris
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -23,6 +20,7 @@
#
# Authors:
# Loic Dachary <[EMAIL PROTECTED]>
+# Bradley M. Kuhn <[EMAIL PROTECTED]>
#
#
ACLOCAL_AMFLAGS = -I config
@@ -34,6 +32,14 @@ pythondir = ${pyexecdir}
python_PYTHON = \
pokereval.py
+if PYTHON_2_6
+py2_6exec_LTLIBRARIES = _pokereval_2_6.la
+_pokereval_2_6_la_SOURCES = pypokereval.c
+_pokereval_2_6_la_LDFLAGS = -module -no-undefined -version-info 1:0:0
+_pokereval_2_6_la_LIBADD = ${PYTHON2_6_LIBS} ${POKER_EVAL_LIBS}
+_pokereval_2_6_la_CFLAGS = ${PYTHON2_6_CFLAGS} ${POKER_EVAL_CFLAGS} -DPYTHON_VERSION=\"2_6\" -D'VERSION_NAME(w)=w\#\#2_6'
+endif
+
if PYTHON_2_5
py2_5exec_LTLIBRARIES = _pokereval_2_5.la
_pokereval_2_5_la_SOURCES = pypokereval.c
diff --git a/pypoker-eval/config/ccpython.m4 b/pypoker-eval/config/ccpython.m4
index b7f305c..a4eae54 100644
--- a/pypoker-eval/config/ccpython.m4
+++ b/pypoker-eval/config/ccpython.m4
@@ -110,7 +110,7 @@ AM_CONDITIONAL([PYTHON_]$2, [test "$have_python" != "no"])
AC_DEFUN([ALL_CC_PYTHON],
[
-m4_define([_AM_PYTHON_INTERPRETER_LIST], [python2.5 python2.4 python2.3])
+m4_define([_AM_PYTHON_INTERPRETER_LIST], [python2.6 python2.5 python2.4 python2.3])
PYTHONS=''
found_one=''
_ONE_CC_PYTHON([=2.3], [2_3])
@@ -121,6 +121,9 @@ if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
unset PYTHON
_ONE_CC_PYTHON([=2.5], [2_5])
if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
+unset PYTHON
+_ONE_CC_PYTHON([=2.6], [2_6])
+if test -f "$PYTHON" ; then found_one=$PYTHON ; PYTHONS="$PYTHON $PYTHONS" ; fi
PYTHON=$found_one
if ! test "$found_one" ; then
AC_MSG_ERROR([No python development environments found])
diff --git a/pypoker-eval/config/python.m4 b/pypoker-eval/config/python.m4
index e11f501..c8c5e30 100644
--- a/pypoker-eval/config/python.m4
+++ b/pypoker-eval/config/python.m4
@@ -42,7 +42,7 @@ AC_DEFUN([AM_PATH_PYTHON],
dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
dnl in 1.5.
m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
- [python python2 python2.5 python2.4 python2.3 python2.2 dnl
+ [python python2 python2.5 python2.6 python2.4 python2.3 python2.2 dnl
python2.1 python2.0 python1.6 python1.5])
m4_if([$1],[],[
--
-- bkuhn
_______________________________________________
Pokersource-users mailing list
[email protected]
https://mail.gna.org/listinfo/pokersource-users
