diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2011-11-30 15:13:19 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2011-11-30 15:13:19 +0000 |
| commit | 31569fc07d6bff9b2d9b8df941555c8aa470e025 (patch) | |
| tree | 09951476a153c9ccd1e4ab38b68ac44cdcf3c2e8 /app-office/gnucash/files | |
| parent | Version bump, bug #392319 by José Romildo Malaquias. (diff) | |
| download | gentoo-2-31569fc07d6bff9b2d9b8df941555c8aa470e025.tar.gz gentoo-2-31569fc07d6bff9b2d9b8df941555c8aa470e025.tar.bz2 gentoo-2-31569fc07d6bff9b2d9b8df941555c8aa470e025.zip | |
Version bump, bug #392317 by José Romildo Malaquias.
(Portage version: 2.1.10.38/cvs/Linux x86_64)
Diffstat (limited to 'app-office/gnucash/files')
| -rw-r--r-- | app-office/gnucash/files/gnucash-2.4.8-python-detection.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/app-office/gnucash/files/gnucash-2.4.8-python-detection.patch b/app-office/gnucash/files/gnucash-2.4.8-python-detection.patch new file mode 100644 index 000000000000..fa691d385a85 --- /dev/null +++ b/app-office/gnucash/files/gnucash-2.4.8-python-detection.patch @@ -0,0 +1,45 @@ +--- macros/ac_python_devel.m4~ 2011-10-17 18:53:34.000000000 +0200 ++++ macros/ac_python_devel.m4 2011-11-30 15:17:45.978799588 +0100 +@@ -20,14 +20,8 @@ + + # Check for Python include path + AC_MSG_CHECKING([for Python include path]) +- python_path=`echo $PYTHON | sed "s,/bin.*$,,"` +- for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do +- python_path=`find -L $i -type f -name Python.h -print | sed "1q"` +- if test -n "$python_path" ; then +- break +- fi +- done +- python_path=`echo $python_path | sed "s,/Python.h$,,"` ++ python_path=`$PYTHON -c 'import distutils.sysconfig; \ ++ print(distutils.sysconfig.get_python_inc())'` + AC_MSG_RESULT([$python_path]) + if test -z "$python_path" ; then + AC_MSG_ERROR([cannot find Python include path]) +@@ -36,21 +30,16 @@ + + # Check for Python library path + AC_MSG_CHECKING([for Python library path]) +- python_path=`echo $PYTHON | sed "s,/bin.*$,,"` +- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do +- python_path=`find -L $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` +- if test -n "$python_path" ; then +- break +- fi +- done +- python_path=`echo $python_path | sed "s,/libpython.*$,,"` ++ python_path=`$PYTHON -c 'import distutils.sysconfig; \ ++ print(distutils.sysconfig.get_config_var("LIBDIR"))'` + AC_MSG_RESULT([$python_path]) + if test -z "$python_path" ; then + AC_MSG_ERROR([cannot find Python library path]) + fi + AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"]) + # +- python_site=`echo $python_path | sed "s/config/site-packages/"` ++ python_site=`$PYTHON -c 'import distutils.sysconfig; \ ++ print(distutils.sysconfig.get_python_lib(standard_lib=False))'` + AC_SUBST([PYTHON_SITE_PKG],[$python_site]) + # + # libraries which must be linked in when embedding |