cmake: specify distutils build path explicitly

so we don't need to replicate the logic in distutils/command/build.py
at different places.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/cmake/modules/AddCephTest.cmake b/cmake/modules/AddCephTest.cmake
index 8506f9e2d60d8c0d0d7dbe1b020fc40c47774ccb..75f17c99e0c5ae32aaeafa63352ed8cad12b33e4 100644 (file)
--- a/cmake/modules/AddCephTest.cmake
+++ b/cmake/modules/AddCephTest.cmake
@@ -13,7 +13,7 @@ function(add_ceph_test test_name test_path)
     CEPH_BUILD_DIR=${CMAKE_BINARY_DIR}
     LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
     PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH}
-    PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.linux-x86_64-2.7:${CMAKE_SOURCE_DIR}/src/pybind
+    PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules:${CMAKE_SOURCE_DIR}/src/pybind
     CEPH_BUILD_VIRTUALENV=${CEPH_BUILD_VIRTUALENV})
   # none of the tests should take more than 1 hour to complete
   set_property(TEST

diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake
index 60f011c46df6467326290af513572954b49f3027..947c0f8da6acaf098ddda71a4a16b0226af206ef 100644 (file)
--- a/cmake/modules/Distutils.cmake
+++ b/cmake/modules/Distutils.cmake
@@ -46,7 +46,8 @@ function(distutils_add_cython_module name src)
     CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR}
     CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
     CFLAGS=\"-iquote${CMAKE_SOURCE_DIR}/src/include\"
-    ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base ${CYTHON_MODULE_DIR} --verbose
+    ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
+    build --build-base ${CYTHON_MODULE_DIR} --build-platlib ${CYTHON_MODULE_DIR} --verbose
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ${src})
 endfunction(distutils_add_cython_module)
@@ -70,7 +71,7 @@ function(distutils_install_cython_module name)
            CPPFLAGS=\"-iquote${CMAKE_SOURCE_DIR}/src/include\"
            LDFLAGS=\"-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}\"
            ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py
-           build --build-base ${CYTHON_MODULE_DIR} --verbose
+           build --build-base ${CYTHON_MODULE_DIR} --build-platlib ${CYTHON_MODULE_LIB} --verbose
            build_ext --cython-c-in-temp --build-temp ${CMAKE_CURRENT_BINARY_DIR} --cython-include-dirs ${PROJECT_SOURCE_DIR}/src/pybind/rados
            install \${options} --single-version-externally-managed --record /dev/null
            egg_info --egg-base ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/src/ceph.in b/src/ceph.in
index 2c06a81c683609c5a3eb4af17622d5edf19ae7d9..54e738cc6a4d7fa044fc4f027939ec95471ea1c7 100755 (executable)
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -66,20 +66,12 @@ def respawn_in_path(lib_path, pybind_path, pythonlib_path):
     sys.path.insert(0, os.path.join(MYDIR, pybind_path))
     sys.path.insert(0, os.path.join(MYDIR, pythonlib_path))
 
-def get_pythonlib_dir():
-    """Returns the name of a distutils build directory"""
-    import sysconfig
-    f = "lib.{platform}-{version[0]}.{version[1]}"
-    name = f.format(platform=sysconfig.get_platform(),
-                    version=sys.version_info)
-    return name
-
 if MYDIR.endswith('src') and \
    os.path.exists(os.path.join(MYDIR, '.libs')) and \
    os.path.exists(os.path.join(MYDIR, 'pybind')) and \
    os.path.exists(os.path.join(MYDIR, 'build')):
 
-    python_libpath = os.path.join(MYDIR, 'build', get_pythonlib_dir())
+    python_libpath = os.path.join(MYDIR, 'build')
     respawn_in_path(os.path.join(MYDIR, '.libs'), 'pybind', python_libpath)
     if 'PATH' in os.environ and MYDIR not in os.environ['PATH']:
         os.environ['PATH'] += ':' + MYDIR
@@ -100,12 +92,7 @@ elif os.path.exists(os.path.join(os.getcwd(), "CMakeCache.txt")) \
         lib_path = os.path.join(os.getcwd(), "lib")
         bin_path = os.path.join(os.getcwd(), "bin")
         pybind_path = os.path.join(src_path, "src", "pybind")
-
-        import sysconfig
-        f = "lib.{platform}-{version[0]}.{version[1]}"
-        name = f.format(platform=sysconfig.get_platform(),
-                        version=sys.version_info)
-        pythonlib_path = os.path.join(os.getcwd(), "lib/cython_modules", name)
+        pythonlib_path = os.path.join(lib_path, "cython_modules")
 
         respawn_in_path(lib_path, pybind_path, pythonlib_path)
 

diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am
index 577431fdd0fbe4f6aec07b194dd825904ab1f2bd..0431f028e052912950e274f2a8d33226664a718e 100644 (file)
--- a/src/pybind/cephfs/Makefile.am
+++ b/src/pybind/cephfs/Makefile.am
@@ -23,6 +23,7 @@ cephfs-pybind-install-exec: ${srcdir}/ceph_ver.h
        fi ; \
        cd $(srcdir)/pybind/cephfs; $(PY_DISTUTILS) build \
        --build-base $(shell readlink -f $(builddir))/build \
+       --build-platlib $(shell readlink -f $(builddir))/build \
        install \
        $$options $$root \
        --single-version-externally-managed \

diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am
index ad555c394b91bb24c998c9cfee6343e1ea1af7b8..a61b25293ddf24ec01a2ca7ba017e0658798254d 100644 (file)
--- a/src/pybind/rados/Makefile.am
+++ b/src/pybind/rados/Makefile.am
@@ -23,6 +23,7 @@ rados-pybind-install-exec: ${srcdir}/ceph_ver.h
        fi ; \
        cd $(srcdir)/pybind/rados; $(PY_DISTUTILS) build \
        --build-base $(shell readlink -f $(builddir))/build \
+       --build-platlib $(shell readlink -f $(builddir))/build \
        install \
        $$options $$root \
        --single-version-externally-managed \

diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am
index affd2de5054d65c781911ab8a90b4201e90a3800..866e4d87cf4f8a565c617e658038f5be85519f12 100644 (file)
--- a/src/pybind/rbd/Makefile.am
+++ b/src/pybind/rbd/Makefile.am
@@ -23,6 +23,7 @@ rbd-pybind-install-exec: ${srcdir}/ceph_ver.h
        fi ; \
        cd $(srcdir)/pybind/rbd; $(PY_DISTUTILS) build \
        --build-base $(shell readlink -f $(builddir))/build \
+       --build-platlib $(shell readlink -f $(builddir))/build \
        install \
        $$options $$root \
        --single-version-externally-managed \