From a2ef53dd6946a8fb407e15228eeb4d86de906d28 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 28 Oct 2016 11:15:27 -0400 Subject: build: python site-packages vs. dist-packages Unlike Fedora and RHEL/CentOS, where python has /usr/{lib,lib64}/python2.7/site-packages/..., Debian-based distributions have /usr/lib/python2.7/dist-packages/... On Debian our python scriptlet to determine this is broken and incorrectly returns .../site-packages, not .../dist-packages. Furthermore, the automake/autoconf/pkgconfig bits ahead of our own scriptlet have already determined the correct location -- all we need to do is use it. This change also slightly reworks the BUILD_PYTHON_INC scriptlet to bring it in line with the style/pattern of the other python scriptlets provided by autoconf/pkgconfig. (I do wonder though, why we have two sets of {C,CPP}FLAGS and LD_FLAGS - PYTHONDEV_CPPFLAGS and BUILD_PYTHON_INC, and PYTHONDEV_LDFLAGS and BUILD_PYTHON_LIB. They both have very similar values, but, e.g. BUILD_PYTHON_INC misses /usr/lib/x86_64-linux-gnu/python2.7 on Debian; even if that ommission doesn't seem to be hurting us.) Change-Id: I309a5c781a1d9aee4d7be2867223781bd2ae18fa BUG: 1389781 Signed-off-by: Kaleb S. KEITHLEY Reviewed-on: http://review.gluster.org/15755 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Niels de Vos --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ac46911ab85..cfefa218156 100644 --- a/configure.ac +++ b/configure.ac @@ -1164,8 +1164,8 @@ if test "x$enable_glupy" = "xyes"; then dnl Find python libs at user configured libdir and also "lib" under prefix PYTHONDEV_LDFLAGS="${PYTHON_LIBS} -L`${PYTHON}-config --prefix`/lib -L`${PYTHON}-config --prefix`/$libdir `${PYTHON}-config --ldflags`" - BUILD_PYTHON_SITE_PACKAGES=`$PYTHON -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix="${exec_prefix}"))'` - BUILD_PYTHON_INC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()"` + BUILD_PYTHON_SITE_PACKAGES=${pythondir} + BUILD_PYTHON_INC=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_inc())" 2>/dev/null` BUILD_PYTHON_LIB=python$PYTHON_VERSION GLUPY_SUBDIR=glupy -- cgit