From ec56a416b72f634de22686b81f82be48dd955ce1 Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Thu, 4 Jan 2018 16:35:09 +0100
Subject: [PATCH] Add support for Ubuntu 17.04 and 17.10.
Basically, build_helper has been adapted so that:
./buil_oai -I -w USRP
works for Ubuntu 17.04 and 17.10.
Concerning those systems:
- compilation with "--eNB --UE -w USRP" works
- the enb softmodem runs on 17.04 (not tested on 17.10)
- nothing else has been tested.
Users should report any problem.
---
cmake_targets/tools/build_helper | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper
index 8cf0d22e91..9686b650d1 100755
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -95,6 +95,8 @@ get_distribution_release() {
check_supported_distribution() {
local distribution=$(get_distribution_release)
case "$distribution" in
+ "ubuntu17.10") return 0 ;;
+ "ubuntu17.04") return 0 ;;
"ubuntu16.04") return 0 ;;
"ubuntu14.04") return 0 ;;
"fedora24") return 0 ;;
@@ -479,16 +481,26 @@ check_install_oai_software() {
fi
$SUDO $INSTALLER update -y
if [[ "$OS_DISTRO" == "ubuntu" ]]; then
+ local LAPACK_LIBNAME="liblapack.so"
+ local LAPACK_TARGET="/usr/lib/atlas-base/atlas/liblapack.so"
$SUDO apt install -y software-properties-common
case "$(get_distribution_release)" in
"ubuntu14.04")
- specific_packages="libtasn1-3-dev"
+ specific_packages="libtasn1-3-dev gccxml libgnutls-dev libatlas-dev"
# For iperf3
$SUDO add-apt-repository "deb http://archive.ubuntu.com/ubuntu trusty-backports universe"
$SUDO apt-get update
;;
"ubuntu16.04")
- specific_packages="libtasn1-6-dev"
+ specific_packages="libtasn1-6-dev gccxml libgnutls-dev libatlas-dev"
+ ;;
+ "ubuntu17.04")
+ specific_packages="libtasn1-6-dev castxml libgnutls28-dev libatlas-dev"
+ ;;
+ "ubuntu17.10")
+ specific_packages="libtasn1-6-dev castxml libgnutls28-dev"
+ LAPACK_LIBNAME="liblapack.so-x86_64-linux-gnu"
+ LAPACK_TARGET="/usr/lib/x86_64-linux-gnu/atlas/liblapack.so"
;;
esac
$SUDO apt-get install -y \
@@ -504,7 +516,6 @@ check_install_oai_software() {
texlive-latex-base \
ethtool \
flex \
- gccxml \
gdb \
git \
graphviz \
@@ -515,7 +526,6 @@ check_install_oai_software() {
iptables \
iptables-dev \
libatlas-base-dev \
- libatlas-dev \
libblas-dev \
libconfig8-dev \
libffi-dev \
@@ -553,11 +563,9 @@ check_install_oai_software() {
wget \
libxpm-dev
- $SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
-
- $SUDO apt-get install -y nettle-dev nettle-bin
+ $SUDO update-alternatives --set "$LAPACK_LIBNAME" "$LAPACK_TARGET"
- $SUDO apt-get install -y libgnutls-dev
+ $SUDO apt-get install -y nettle-dev nettle-bin
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
if [[ "$OS_DISTRO" == "rhel" ]] || [[ "$OS_DISTRO" == "centos" ]]; then
if rpm -q epel-release > /dev/null; then
--
GitLab