From 62787a8893ecfd21748c8fcad93459035819463a Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Mon, 19 Feb 2018 14:09:09 +0100
Subject: [PATCH] fix CentOS compilation
The following was not working properly:
./build_oai -I -w USRP
After this commit it works.
And so does:
./build_oai --eNB -w USRP
---
cmake_targets/tools/build_helper | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 1ea97c030f..706cd05fe9 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -249,14 +249,14 @@ install_usrp_uhd_driver_from_source(){
cd /tmp
echo "Downloading UHD driver"
rm -rf /tmp/uhd
- git clone git://github.com/EttusResearch/uhd.git
+ git clone https://github.com/EttusResearch/uhd.git
cd uhd
git checkout tags/release_003_010_001_001
mkdir -p host/build
cd host/build
$CMAKE ../
echo "Compiling UHD"
- make
+ make -j`nproc`
make test
$SUDO make install
$SUDO ldconfig
@@ -277,10 +277,11 @@ check_install_usrp_uhd_driver(){
$SUDO apt-get -y --allow-unauthenticated install libuhd-dev libuhd003 uhd-host
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
$SUDO $INSTALLER -y install python boost libusb-devel libusbx-devel boost-devel python-mako python-docutils cmake
+ $SUDO pip install requests
if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
# until EPEL repo hasn't bumped UHD driver to >=3.10 in EPEL, build driver from source
$SUDO $INSTALLER -y remove uhd uhd-devel uhd-firmware
- install_ursp_uhd_driver_from_source
+ install_usrp_uhd_driver_from_source
else
$SUDO $INSTALLER -y install uhd uhd-devel uhd-firmware
fi
@@ -644,7 +645,8 @@ check_install_oai_software() {
lapack \
lapack-devel \
blas \
- blas-devel
+ blas-devel \
+ libyaml-devel
fi
install_asn1c_from_source
--
GitLab