Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-AMF
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenXG
OpenXG-AMF
Commits
66a55a86
Commit
66a55a86
authored
Nov 09, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix_boost_issue' into 'develop'
Fix boost issue See merge request oai/cn5g/oai-cn5g-amf!74
parents
9b1fbb7c
a3ccf201
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
2 deletions
+14
-2
build/scripts/build_helper
build/scripts/build_helper
+3
-0
build/scripts/build_helper.amf
build/scripts/build_helper.amf
+11
-1
build/scripts/build_helper.fb_folly
build/scripts/build_helper.fb_folly
+0
-1
No files found.
build/scripts/build_helper
View file @
66a55a86
...
@@ -133,6 +133,9 @@ check_supported_distribution() {
...
@@ -133,6 +133,9 @@ check_supported_distribution() {
"rhel8.2") return 0 ;;
"rhel8.2") return 0 ;;
"rhel8.3") return 0 ;;
"rhel8.3") return 0 ;;
"rhel8.4") return 0 ;;
"rhel8.4") return 0 ;;
"rhel8.5") return 0 ;;
"rhel8.6") return 0 ;;
"rhel8.7") return 0 ;;
#"centos7") return 0 ;;
#"centos7") return 0 ;;
esac
esac
return 1
return 1
...
...
build/scripts/build_helper.amf
View file @
66a55a86
...
@@ -437,7 +437,6 @@ check_install_amf_deps(){
...
@@ -437,7 +437,6 @@ check_install_amf_deps(){
# removed libspdlog-dev
# removed libspdlog-dev
PACKAGE_LIST="\
PACKAGE_LIST="\
$specific_packages \
$specific_packages \
libboost1.67-dev \
mysql-server \
mysql-server \
mysql-client \
mysql-client \
libmysqlclient-dev \
libmysqlclient-dev \
...
@@ -494,6 +493,17 @@ check_install_amf_deps(){
...
@@ -494,6 +493,17 @@ check_install_amf_deps(){
fi
fi
echo "Install distro libs"
echo "Install distro libs"
$SUDO $INSTALLER install $OPTION $PACKAGE_LIST
$SUDO $INSTALLER install $OPTION $PACKAGE_LIST
# fix issue with libboost in U18 for a bare metal deployment
if [[ $OS_DISTRO == "ubuntu" ]]; then
case "$(get_distribution_release)" in
"ubuntu18.04")
$SUDO $INSTALLER remove libboost1.65-dev
$SUDO $INSTALLER install libboost1.67-dev
;;
esac
fi
ret=$?;[[ $ret -ne 0 ]] && return $ret
ret=$?;[[ $ret -ne 0 ]] && return $ret
echo "distro libs installation complete"
echo "distro libs installation complete"
...
...
build/scripts/build_helper.fb_folly
View file @
66a55a86
...
@@ -53,7 +53,6 @@ install_fb_folly_from_source(){
...
@@ -53,7 +53,6 @@ install_fb_folly_from_source(){
gcc-c++ \
gcc-c++ \
$CMAKE \
$CMAKE \
make \
make \
boost-devel \
libevent-devel \
libevent-devel \
double-conversion-devel \
double-conversion-devel \
glog-devel \
glog-devel \
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment