| 1 |
mrpouet 09/06/21 11:53:44 |
| 2 |
|
| 3 |
Added: dia-0.97-acinclude-python-fixes.patch |
| 4 |
Log: |
| 5 |
Fix compilation error with USE="python", bug #271855, and fix missing EAPI="2" |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-office/dia/files/dia-0.97-acinclude-python-fixes.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-office/dia/files/dia-0.97-acinclude-python-fixes.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: dia-0.97-acinclude-python-fixes.patch |
| 15 |
=================================================================== |
| 16 |
acinclude.m4 | 9 +++++---- |
| 17 |
1 files changed, 5 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/acinclude.m4 b/acinclude.m4 |
| 20 |
index 57a2188..1bf3ad0 100644 |
| 21 |
--- a/acinclude.m4 |
| 22 |
+++ b/acinclude.m4 |
| 23 |
@@ -128,7 +128,7 @@ else: |
| 24 |
AC_CACHE_CHECK([for $am_display_PYTHON script directory], |
| 25 |
[am_cv_python_pythondir], |
| 26 |
[am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || |
| 27 |
- echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) |
| 28 |
+ echo "$PYTHON_PREFIX/${py_lib}/python$PYTHON_VERSION/site-packages"`]) |
| 29 |
AC_SUBST([pythondir], [$am_cv_python_pythondir]) |
| 30 |
|
| 31 |
dnl pkgpythondir -- $PACKAGE directory under pythondir. Was |
| 32 |
@@ -145,7 +145,7 @@ else: |
| 33 |
AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], |
| 34 |
[am_cv_python_pyexecdir], |
| 35 |
[am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || |
| 36 |
- echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`]) |
| 37 |
+ echo "${PYTHON_EXEC_PREFIX}/${py_lib}/python${PYTHON_VERSION}/site-packages"`]) |
| 38 |
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) |
| 39 |
|
| 40 |
dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) |
| 41 |
@@ -202,6 +202,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], |
| 42 |
AC_MSG_CHECKING(for headers required to compile python extensions) |
| 43 |
dnl deduce PYTHON_INCLUDES |
| 44 |
py_prefix=`$PYTHON -c "import sys; print sys.prefix"` |
| 45 |
+py_lib=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,1)" | cut -d '/' -f 3` |
| 46 |
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` |
| 47 |
PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" |
| 48 |
if test "$py_prefix" != "$py_exec_prefix"; then |
| 49 |
@@ -225,7 +226,7 @@ AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) |
| 50 |
|
| 51 |
AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a) |
| 52 |
|
| 53 |
-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config" |
| 54 |
+py_config_dir="$py_prefix/$py_lib/python${PYTHON_VERSION}/config" |
| 55 |
|
| 56 |
py_makefile="${py_config_dir}/Makefile" |
| 57 |
if test -f "$py_makefile"; then |
| 58 |
@@ -235,7 +236,7 @@ dnl extra required libs |
| 59 |
py_other_libs=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $py_makefile` |
| 60 |
|
| 61 |
dnl now the actual libpython |
| 62 |
- if test -e "${py_config_dir}/libpython${PYTHON_VERSION}.a"; then |
| 63 |
+ if test -e "$PYTHON_PREFIX/${py_lib}/libpython${PYTHON_VERSION}.so"; then |
| 64 |
PYTHON_LIBS="-L${py_config_dir} -lpython${PYTHON_VERSION} $py_localmodlibs $py_basemodlibs $py_other_libs" |
| 65 |
AC_MSG_RESULT(found) |
| 66 |
else |
Archives