From c5cd3a0e95499226b0268eabec019d701240778e Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 30 Sep 2020 13:27:24 +0200
Subject: [PATCH] do not install libfabric for manylinux packages
---
deploy/build_env/Ubuntu16.04/install_libfabric.sh | 2 +-
deploy/build_env/manylinux2010/Dockerfile | 3 ---
deploy/build_env/manylinux2010/build.sh | 2 +-
deploy/build_env/manylinux2010/install_libfabric.sh | 13 -------------
4 files changed, 2 insertions(+), 18 deletions(-)
delete mode 100755 deploy/build_env/manylinux2010/install_libfabric.sh
diff --git a/deploy/build_env/Ubuntu16.04/install_libfabric.sh b/deploy/build_env/Ubuntu16.04/install_libfabric.sh
index cfa39b7ac..a6ef6db45 100755
--- a/deploy/build_env/Ubuntu16.04/install_libfabric.sh
+++ b/deploy/build_env/Ubuntu16.04/install_libfabric.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-apt install -y wget autoconf libtool make librdmacm-dev
+apt install -y wget autoconf libtool make librdmacm-dev rdma-core
wget https://github.com/ofiwg/libfabric/archive/v1.11.0.tar.gz
tar xzf v1.11.0.tar.gz
cd libfabric-1.11.0
diff --git a/deploy/build_env/manylinux2010/Dockerfile b/deploy/build_env/manylinux2010/Dockerfile
index 847c30f8d..04a994ee4 100644
--- a/deploy/build_env/manylinux2010/Dockerfile
+++ b/deploy/build_env/manylinux2010/Dockerfile
@@ -10,9 +10,6 @@ RUN ./install_curl.sh /curl
ADD install_cmake.sh install_cmake.sh
RUN ./install_cmake.sh
-ADD install_libfabric.sh install_libfabric.sh
-RUN ./install_libfabric.sh
-
RUN chmod og+rwX -R /opt
ADD build.sh /bin/build.sh
\ No newline at end of file
diff --git a/deploy/build_env/manylinux2010/build.sh b/deploy/build_env/manylinux2010/build.sh
index 5e2fa538f..4ac46715e 100755
--- a/deploy/build_env/manylinux2010/build.sh
+++ b/deploy/build_env/manylinux2010/build.sh
@@ -6,7 +6,7 @@ for python_path in /opt/python/cp{27,35,36,37}*m; do
pip=$python_path/bin/pip
cd /asapo/build
- cmake -DENABLE_LIBFABRIC=on -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl -DPython_EXECUTABLE=$python ..
+ cmake -DENABLE_LIBFABRIC=off -DCMAKE_BUILD_TYPE="Release" -DLIBCURL_DIR=/curl -DPython_EXECUTABLE=$python ..
cd consumer \
&& $pip install -r /asapo/consumer/api/python/dev-requirements.txt \
&& make \
diff --git a/deploy/build_env/manylinux2010/install_libfabric.sh b/deploy/build_env/manylinux2010/install_libfabric.sh
deleted file mode 100755
index cfa39b7ac..000000000
--- a/deploy/build_env/manylinux2010/install_libfabric.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-apt install -y wget autoconf libtool make librdmacm-dev
-wget https://github.com/ofiwg/libfabric/archive/v1.11.0.tar.gz
-tar xzf v1.11.0.tar.gz
-cd libfabric-1.11.0
-./autogen.sh
-./configure
-make
-make install
-cd -
-rm -rf libfabric-1.11.0
-rm v1.11.0.tar.gz
--
GitLab