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
8fdaf61d
Unverified
Commit
8fdaf61d
authored
Jul 01, 2021
by
kharade
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove legacy libs
parent
309d4f53
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
9 deletions
+8
-9
build/scripts/build_helper.amf
build/scripts/build_helper.amf
+5
-5
build/scripts/build_helper.fb_folly
build/scripts/build_helper.fb_folly
+0
-1
docker/Dockerfile.amf.ubuntu18
docker/Dockerfile.amf.ubuntu18
+3
-3
No files found.
build/scripts/build_helper.amf
View file @
8fdaf61d
...
...
@@ -361,11 +361,11 @@ check_install_amf_deps(){
# PPA has 1.67
$SUDO add-apt-repository ppa:mhier/libboost-latest --yes
$SUDO $INSTALLER update
#var_ubuntu_18_04=1
#var_ubuntu_18_04=1
if [ $IS_CONTAINER -eq 0 ]; then
specific_packages="libconfig++-dev libasio-dev libboost-all-dev mysql-server"
else
specific_packages="libconfig++-dev
libasio-dev libboost-all-dev
"
specific_packages="libconfig++-dev"
fi
;;
*)
...
...
@@ -379,10 +379,10 @@ check_install_amf_deps(){
# removed libspdlog-dev
PACKAGE_LIST="\
$specific_packages \
libboost1.67-dev \
mysql-server \
mysql-client \
libmysqlclient-dev \
libcpprest-dev \
guile-2.0-dev \
libcurl4-gnutls-dev \
libevent-dev \
...
...
@@ -441,8 +441,8 @@ check_install_amf_deps(){
ret=$?;[[ $ret -ne 0 ]] && return $ret
# Use fmt lib included in spdlog
install_fmt $1
ret=$?;[[ $ret -ne 0 ]] && return $ret
#
install_fmt $1
#
ret=$?;[[ $ret -ne 0 ]] && return $ret
install_spdlog_from_git $1 $2
ret=$?;[[ $ret -ne 0 ]] && return $ret
...
...
build/scripts/build_helper.fb_folly
View file @
8fdaf61d
...
...
@@ -67,7 +67,6 @@ install_fb_folly_from_source(){
$CMAKE \
g++ \
libevent-dev \
libboost1.67-dev \
libdouble-conversion-dev \
libgoogle-glog-dev \
libgflags-dev \
...
...
docker/Dockerfile.amf.ubuntu18
View file @
8fdaf61d
...
...
@@ -85,9 +85,9 @@ COPY --from=oai-amf-builder /openair-amf/scripts/entrypoint.sh entrypoint.sh
WORKDIR /usr/lib/x86_64-linux-gnu
COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libmysqlclient.so.20 .
COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 .
COPY --from=oai-
s
mf-builder /usr/lib/libboost_system.so.1.67.0 .
COPY --from=oai-
s
mf-builder /usr/lib/libboost_thread.so.1.67.0 .
COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libcpprest.so.2.10 .
COPY --from=oai-
a
mf-builder /usr/lib/libboost_system.so.1.67.0 .
COPY --from=oai-
a
mf-builder /usr/lib/libboost_thread.so.1.67.0 .
#
COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libcpprest.so.2.10 .
COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 .
COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/libssl.so.1.1 .
COPY --from=oai-amf-builder /usr/lib/x86_64-linux-gnu/librtmp.so.1 .
...
...
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