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
5d0fea32
Commit
5d0fea32
authored
May 18, 2021
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[DOCKER][RHEL8] fix cmake3 hardcoded calls
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
765c0f42
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
build/scripts/build_helper.amf
build/scripts/build_helper.amf
+1
-1
build/scripts/build_helper.fb_folly
build/scripts/build_helper.fb_folly
+3
-5
No files found.
build/scripts/build_helper.amf
View file @
5d0fea32
...
...
@@ -285,7 +285,7 @@ check_install_amf_deps(){
automake \
bison \
build-essential \
cmake
\
$CMAKE
\
daemon \
doxygen \
flex \
...
...
build/scripts/build_helper.fb_folly
View file @
5d0fea32
...
...
@@ -49,6 +49,7 @@ install_fb_folly_from_source(){
then
if [[ "$OS_BASEDISTRO" == "fedora" ]]; then
$SUDO $INSTALLER install $OPTION \
$CMAKE \
boost-devel \
libevent-devel \
double-conversion-devel \
...
...
@@ -63,6 +64,7 @@ install_fb_folly_from_source(){
ret=$?;[[ $ret -ne 0 ]] && return $ret
elif [[ $OS_DISTRO == "ubuntu" ]]; then
$SUDO $INSTALLER install $OPTION \
$CMAKE \
g++ \
libevent-dev \
libdouble-conversion-dev \
...
...
@@ -126,11 +128,7 @@ install_fb_folly_from_source(){
git checkout -f v2019.11.11.00
fi
mkdir _build && cd _build
if [[ "$OS_BASEDISTRO" == "fedora" ]]; then
cmake3 ..
else
cmake ..
fi
$CMAKE ..
ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
make -j $(nproc)
ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
...
...
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