mirror of
git://git.yoctoproject.org/poky
synced 2026-08-15 02:16:25 +00:00
1132970f0e
python.m4 has python scriptlets that determine where the system's library directory is. For Python 2.x distutils.sysconfig is used (which works because we patch it), for Python 3.x plain sysconfig is used (which doesn't work for example on x32). There is also a hardcoded fallback if the scriptlets fail. This commit removes the scriptlets altogether and just uses the hardcoded path always, due to above mentioned issues with x32. (From OE-Core rev: 0c856653ce65403791e1e5c78229820ff794bae3) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
92 lines
3.4 KiB
Diff
92 lines
3.4 KiB
Diff
From 472a3d36c97ef7535f05d6c185edcbc22b0074c4 Mon Sep 17 00:00:00 2001
|
|
From: Kumar Gala <galak@kernel.crashing.org>
|
|
Date: Thu, 11 Aug 2011 01:26:33 -0500
|
|
Subject: [PATCH 1/4] automake: Update for python.m4 to respect libdir
|
|
|
|
Upstream-Status: Inappropriate [embedded specific]
|
|
|
|
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
|
|
|
|
Updated for automake-1.12.6
|
|
|
|
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
|
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
|
|
---
|
|
m4/python.m4 | 27 +++++++--------------------
|
|
1 file changed, 7 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/m4/python.m4 b/m4/python.m4
|
|
index 5b2c695..ed19261 100644
|
|
--- a/m4/python.m4
|
|
+++ b/m4/python.m4
|
|
@@ -91,12 +91,13 @@ AC_DEFUN([AM_PATH_PYTHON],
|
|
[am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
|
|
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
|
|
|
|
- dnl Use the values of $prefix and $exec_prefix for the corresponding
|
|
- dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made
|
|
+ dnl Use the values of $prefix, $libdir and $exec_prefix for the corresponding
|
|
+ dnl values of PYTHON_PREFIX PYTHON_LIB_PREFIX, and PYTHON_EXEC_PREFIX. These are made
|
|
dnl distinct variables so they can be overridden if need be. However,
|
|
dnl general consensus is that you shouldn't need this ability.
|
|
|
|
AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
|
|
+ AC_SUBST([PYTHON_LIB_PREFIX], ['${libdir}'])
|
|
AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
|
|
|
|
dnl At times (like when building shared libraries) you may want
|
|
@@ -141,14 +142,7 @@ except ImportError:
|
|
else
|
|
am_py_prefix=$prefix
|
|
fi
|
|
- am_cv_python_pythondir=`$PYTHON -c "
|
|
-$am_python_setup_sysconfig
|
|
-if can_use_sysconfig:
|
|
- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
|
|
-else:
|
|
- from distutils import sysconfig
|
|
- sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
|
|
-sys.stdout.write(sitedir)"`
|
|
+ am_cv_python_pythondir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
|
|
case $am_cv_python_pythondir in
|
|
$am_py_prefix*)
|
|
am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
|
|
@@ -158,7 +152,7 @@ sys.stdout.write(sitedir)"`
|
|
case $am_py_prefix in
|
|
/usr|/System*) ;;
|
|
*)
|
|
- am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
|
+ am_cv_python_pythondir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
|
|
;;
|
|
esac
|
|
;;
|
|
@@ -183,14 +177,7 @@ sys.stdout.write(sitedir)"`
|
|
else
|
|
am_py_exec_prefix=$exec_prefix
|
|
fi
|
|
- am_cv_python_pyexecdir=`$PYTHON -c "
|
|
-$am_python_setup_sysconfig
|
|
-if can_use_sysconfig:
|
|
- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
|
|
-else:
|
|
- from distutils import sysconfig
|
|
- sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
|
|
-sys.stdout.write(sitedir)"`
|
|
+ am_cv_python_pyexecdir=`echo "$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages"`
|
|
case $am_cv_python_pyexecdir in
|
|
$am_py_exec_prefix*)
|
|
am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
|
|
@@ -200,7 +187,7 @@ sys.stdout.write(sitedir)"`
|
|
case $am_py_exec_prefix in
|
|
/usr|/System*) ;;
|
|
*)
|
|
- am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
|
|
+ am_cv_python_pyexecdir=$PYTHON_LIB_PREFIX/python$PYTHON_VERSION/site-packages
|
|
;;
|
|
esac
|
|
;;
|
|
--
|
|
2.8.1
|
|
|