This is an automated email from the ASF dual-hosted git repository.

okislal pushed a commit to branch madlib2-master
in repository https://gitbox.apache.org/repos/asf/madlib.git

commit 96dd1d5b705c7d51f91cb5a34a4df44cdc8c3960
Author: Orhan Kislal <[email protected]>
AuthorDate: Fri Aug 18 15:34:03 2023 +0300

    Build: Add Ubuntu flag for PyXB installation
    
    PyXB uses distutils which is being phased out. The ubuntu images fail to
    install it the old way so this commit adds a flag to identify the OS as
    Ubuntu during cmake and use pip install as needed.
---
 src/CMakeLists.txt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fc4be6ba..9b02df8d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -146,6 +146,8 @@ find_package(PythonInterp REQUIRED)
 
 set(BUILD_PYTHON_LIBDIR "${CMAKE_BINARY_DIR}/src/lib/python")
 
+
+if(IS_UBUNTU)
 ExternalProject_Add(EP_pyxb
     PREFIX ${MAD_THIRD_PARTY}
     DOWNLOAD_DIR ${MAD_THIRD_PARTY}/downloads
@@ -156,8 +158,26 @@ ExternalProject_Add(EP_pyxb
     SOURCE_DIR ${MAD_THIRD_PARTY}/src/EP_pyxb
     BUILD_COMMAND ""
     BUILD_IN_SOURCE 1
+
+    INSTALL_COMMAND pip3 install .
+)
+endif(IS_UBUNTU)
+
+if((NOT IS_UBUNTU))
+ExternalProject_Add(EP_pyxb
+    PREFIX ${MAD_THIRD_PARTY}
+    DOWNLOAD_DIR ${MAD_THIRD_PARTY}/downloads
+    URL ${PYXB_TAR_SOURCE}
+    URL_MD5 ${PYXB_TAR_MD5}
+    PATCH_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/patch/PyXB.sh"
+    CONFIGURE_COMMAND ""
+    SOURCE_DIR ${MAD_THIRD_PARTY}/src/EP_pyxb
+    BUILD_COMMAND ""
+    BUILD_IN_SOURCE 1
+
     INSTALL_COMMAND ${PYTHON_EXECUTABLE} setup.py install --install-lib 
${BUILD_PYTHON_LIBDIR} > /dev/null
 )
+endif((NOT IS_UBUNTU))
 
 install(DIRECTORY ${BUILD_PYTHON_LIBDIR}
     DESTINATION lib

Reply via email to