diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-04-10 18:52:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-10 18:52:56 +0000 |
| commit | 986737366cca2896c049c4437d3f419e3343a0cd (patch) | |
| tree | 4e7c7224e39df3871f2b9934ad9e14559309bf11 /app-pda/libopensync/files | |
| parent | Update from tadeboro@gmail.com (#265633) (diff) | |
| download | gentoo-2-986737366cca2896c049c4437d3f419e3343a0cd.tar.gz gentoo-2-986737366cca2896c049c4437d3f419e3343a0cd.tar.bz2 gentoo-2-986737366cca2896c049c4437d3f419e3343a0cd.zip | |
Fix compile failure with python-2.6.
(Portage version: 2.2_rc28_p13311/cvs/Linux i686)
Diffstat (limited to 'app-pda/libopensync/files')
| -rw-r--r-- | app-pda/libopensync/files/libopensync-py2.6.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/app-pda/libopensync/files/libopensync-py2.6.patch b/app-pda/libopensync/files/libopensync-py2.6.patch new file mode 100644 index 000000000000..6fdda2c60bed --- /dev/null +++ b/app-pda/libopensync/files/libopensync-py2.6.patch @@ -0,0 +1,65 @@ +--- cmake/modules/FindPythonLibs.cmake ++++ cmake/modules/FindPythonLibs.cmake +@@ -17,8 +17,10 @@ + + IF(WIN32) + FIND_LIBRARY(PYTHON_DEBUG_LIBRARY +- NAMES python25_d python24_d python23_d python22_d python21_d python20_d python ++ NAMES python26_d python25_d python24_d python23_d python22_d python21_d python20_d python + PATHS ++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs/Debug ++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs/Debug +@@ -39,7 +41,8 @@ + ENDIF(WIN32) + + FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION} +- NAMES python25 python2.5 ++ NAMES python26 python2.6 ++ python25 python2.5 + python24 python2.4 + python23 python2.3 + python22 python2.2 +@@ -49,6 +52,7 @@ + python15 python1.5 + + PATHS ++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/libs +@@ -59,6 +63,7 @@ + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs + + PATH_SUFFIXES ++ python2.6/config + python2.5/config + python2.4/config + python2.3/config +@@ -77,7 +82,7 @@ + SET(PYTHON_FRAMEWORK_INCLUDES) + IF(Python_FRAMEWORKS) + IF(NOT PYTHON_INCLUDE_PATH) +- FOREACH(version 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) ++ FOREACH(version 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) + FOREACH(dir ${Python_FRAMEWORKS}) + SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES} + ${dir}/Versions/${version}/include/python${version}) +@@ -91,6 +96,7 @@ + + PATHS + ${PYTHON_FRAMEWORK_INCLUDES} ++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/include + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]/include +@@ -102,6 +108,7 @@ + + PATH_SUFFIXES + ${PREFERRED_PYTHON_VERSION} ++ python2.6 + python2.5 + python2.4 + python2.3 |