| 1 |
bicatali 09/02/02 12:22:07 |
| 2 |
|
| 3 |
Added: pythonmagick-0.8-python26.patch |
| 4 |
Removed: pythonmagick-0.6-gentoo_misc_fixes.patch |
| 5 |
Log: |
| 6 |
Added fix for python-2.6, re-use autotools, removed older versions |
| 7 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-python/pythonmagick/files/pythonmagick-0.8-python26.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pythonmagick/files/pythonmagick-0.8-python26.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pythonmagick/files/pythonmagick-0.8-python26.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: pythonmagick-0.8-python26.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nur PythonMagick-0.8.orig/configure.ac PythonMagick-0.8/configure.ac |
| 18 |
--- PythonMagick-0.8.orig/configure.ac 2009-02-02 11:53:17.965859950 +0000 |
| 19 |
+++ PythonMagick-0.8/configure.ac 2009-02-02 11:54:04.118583794 +0000 |
| 20 |
@@ -17,7 +17,7 @@ |
| 21 |
AC_PROG_LN_S |
| 22 |
AC_PROG_MAKE_SET |
| 23 |
AC_PROG_LIBTOOL |
| 24 |
-AM_PATH_PYTHON(2.5) |
| 25 |
+AM_PATH_PYTHON |
| 26 |
PKG_PROG_PKG_CONFIG |
| 27 |
|
| 28 |
# Checks for libraries. |
| 29 |
diff -Nur PythonMagick-0.8.orig/m4/ax_python.m4 PythonMagick-0.8/m4/ax_python.m4 |
| 30 |
--- PythonMagick-0.8.orig/m4/ax_python.m4 2009-02-02 11:53:17.965859950 +0000 |
| 31 |
+++ PythonMagick-0.8/m4/ax_python.m4 2009-02-02 11:53:50.063895989 +0000 |
| 32 |
@@ -58,13 +58,13 @@ |
| 33 |
AC_DEFUN([AX_PYTHON], |
| 34 |
[AC_MSG_CHECKING(for python build information) |
| 35 |
AC_MSG_RESULT([]) |
| 36 |
-for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do |
| 37 |
+for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do |
| 38 |
AC_CHECK_PROGS(PYTHON_BIN, [$python]) |
| 39 |
ax_python_bin=$PYTHON_BIN |
| 40 |
if test x$ax_python_bin != x; then |
| 41 |
AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) |
| 42 |
AC_CHECK_HEADER([$ax_python_bin/Python.h], |
| 43 |
- [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]], |
| 44 |
+ [[ax_python_header=`locate $ax_python_bin/Python.h | head -n 1 | sed -e s,/Python.h,,`]], |
| 45 |
ax_python_header=no) |
| 46 |
if test $ax_python_lib != no; then |
| 47 |
if test $ax_python_header != no; then |
Archives