Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
openfpm_pdata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sbalzarini Lab
Software
Parallel Computing
OpenFPM
openfpm_pdata
Commits
c81b8e16
Commit
c81b8e16
authored
9 years ago
by
Pietro Incardona
Browse files
Options
Downloads
Patches
Plain Diff
Fixing installation on fresh Fedora 23
parent
aaa99091
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
install
+1
-0
1 addition, 0 deletions
install
script/detect_gcc
+1
-1
1 addition, 1 deletion
script/detect_gcc
script/pre_req
+22
-2
22 additions, 2 deletions
script/pre_req
script/solve_gpp
+8
-0
8 additions, 0 deletions
script/solve_gpp
with
32 additions
and
3 deletions
install
+
1
−
0
View file @
c81b8e16
...
...
@@ -108,6 +108,7 @@ echo -e "\033[1;34;5mDEPENCENCIES INSTALLATION DIR \033[0m"
echo
-e
"Every required dependencies if needed will be installed into:
\0
33[1;34;5m
$i_dir
\0
33[0m"
echo
-e
"if you want to install somewhere else do ./install -i /somewhere/else"
if
[
$sq
-eq
0
]
;
then
unset
commands
commands[0]
=
"Continue"
possible_solutions
"
${
commands
[@]
}
"
fi
...
...
This diff is collapsed.
Click to expand it.
script/detect_gcc
+
1
−
1
View file @
c81b8e16
...
...
@@ -53,7 +53,7 @@ function detect_gcc_or_clang()
fi
$1
--version
|
grep
$1
if
[
$?
==
0
-a
x
"
$1
"
==
x
"g
cc
"
]
;
then
if
[
$?
==
0
-a
x
"
$1
"
==
x
"g
++
"
]
;
then
dgc_major
=
$(
$1
--version
|
grep
$1
|
sed
's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/g'
)
dgc_middle
=
$(
$1
--version
|
grep
$1
|
sed
's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/g'
)
dgc_minor
=
$(
$1
--version
|
grep
$1
|
sed
's/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/g'
)
...
...
This diff is collapsed.
Click to expand it.
script/pre_req
+
22
−
2
View file @
c81b8e16
...
...
@@ -50,6 +50,26 @@ if [ x"$platform" = x"linux" -a x"$pcman" = x"sudo apt-get" ]; then
fi
fi
### Additional package required for yum based distros
if
[
x
"
$platform
"
=
x
"linux"
-a
x
"
$pcman
"
=
x
"yum"
]
;
then
rpm
-V
bzip2-devel
ret1
=
$?
rpm
-V
python-devel
ret2
=
$?
rpm
-V
libxml2-devel
ret3
=
$?
rpm
-V
libxslt-devel
ret4
=
$?
if
[
$ret1
-ne
0
-o
$ret2
-ne
0
-o
$ret3
-ne
0
-o
$ret4
-ne
0
]
;
then
echo
"OpenFPM require additional packages in order to install correctly"
commands[0]
=
"su -c
\"
$pcman
install bzip2-devel python-devel libxml2-devel libxslt-devel
\"
"
commands[1]
=
"sudo
$pcman
install bzip2-devel python-devel libxml2-devel libxslt-devel"
possible_solutions
"
${
commands
[@]
}
"
echo
"Executing:
${
command
[
$possible_solutions_ret
]
}
"
eval
${
commands
[
$possible_solutions_ret
]
}
fi
fi
command
-v
cmake
>
/dev/null 2>&1
if
[
$?
-ne
0
]
;
then
echo
>
&2
...
...
@@ -161,10 +181,10 @@ fi
#### Detecting g++
detect_gcc_or_clang g
cc
detect_gcc_or_clang g
++
if
[
$dgc_ret
-eq
0
]
;
then
solve_gpp
$platform
detect_gcc_or_clang
gcc-4.9
detect_gcc_or_clang
$compiler_gpp
if
[
$dgc_ret
-eq
0
]
;
then
exit
1
fi
...
...
This diff is collapsed.
Click to expand it.
script/solve_gpp
+
8
−
0
View file @
c81b8e16
...
...
@@ -19,6 +19,14 @@ if [ x"$1" = x"osx" ]; then
compiler_opt
=
" CXX=g++-4.9 CC=gcc-4.9 "
compiler_gcc
=
"gcc-4.9"
compiler_gpp
=
"g++-4.9"
elif
[
x
"
$1
"
=
x
"linux"
]
;
then
commands[0]
=
"su -c
\"
$pcman
install gcc-c++
\"
"
commands[1]
=
"sudo
$pcman
install gcc-c++"
possible_solutions
"
${
commands
[@]
}
"
echo
"Executing:
${
command
[
$possible_solutions_ret
]
}
"
eval
${
commands
[
$possible_solutions_ret
]
}
compiler_gcc
=
"gcc"
compiler_gpp
=
"g++"
fi
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment