From 7e43fc23e823fd7515c57b5a800f0af661f61122 Mon Sep 17 00:00:00 2001
From: incardon <incardon@sbalzarini-mac-5.local>
Date: Fri, 5 Feb 2016 17:56:25 +0100
Subject: [PATCH] Fixing installation process
---
install | 6 ++++++
script/detect_gfortran | 14 --------------
script/pre_req | 5 ++++-
script/solve_gfortran | 6 +++---
4 files changed, 13 insertions(+), 18 deletions(-)
delete mode 100755 script/detect_gfortran
diff --git a/install b/install
index dcaf73ee2..6bcb17830 100755
--- a/install
+++ b/install
@@ -92,6 +92,12 @@ if [ ! -d src/config ]; then
fi
cd ..
+cd openfpm_numerics
+if [ ! -d src/config ]; then
+ mkdir src/config
+fi
+cd ..
+
# Create config directory
if [ ! -d src/config ]; then
diff --git a/script/detect_gfortran b/script/detect_gfortran
deleted file mode 100755
index 76ea2a667..000000000
--- a/script/detect_gfortran
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-function detect_gfortran()
-{
- command -v $1 >/dev/null 2>&1
- if [ $? -ne 0 ]; then
- dgc_ret=0
- return
- fi
-
- dgc_ret=1
-}
-
-
diff --git a/script/pre_req b/script/pre_req
index 5d47e3463..6890a9ce9 100755
--- a/script/pre_req
+++ b/script/pre_req
@@ -6,13 +6,14 @@ source script/discover_package_manager
source script/discover_os
source script/solve_autoconf
source script/solve_gpp
+source script/solve_gfortran
source script/solve_cmake
source script/solve_git
source script/solve_wget
source script/solve_automake
source script/solve_brew
source script/solve_libtool
-source script/solve_gfortran
+source script/solve_fortran
source script/detect_gcc
source script/detect_osx
source script/show_solutions
@@ -185,6 +186,7 @@ fi
detect_gcc_or_clang g++
if [ $dgc_ret -eq 0 ]; then
+ echo -e "g++ \033[91;5;1m FAILED \033[0m"
solve_gpp $platform
detect_gcc_or_clang $compiler_gpp
if [ $dgc_ret -eq 0 ]; then
@@ -203,6 +205,7 @@ fi
detect_fortran gfortran
if [ $dgc_ret -eq 0 ]; then
+ echo -e "gfortran\033[91;5;1m FAILED \033[0m"
solve_gfortran $platform
detect_fortran $compiler_fortran
if [ $dgc_ret -eq 0 ]; then
diff --git a/script/solve_gfortran b/script/solve_gfortran
index ab3fe353d..af6d465c4 100644
--- a/script/solve_gfortran
+++ b/script/solve_gfortran
@@ -11,13 +11,13 @@ if [ x"$pcman" = x"" ]; then
fi
if [ x"$1" = x"osx" ]; then
- commands[0]="$pcman install gfortran"
+ commands[0]="$pcman install gcc"
possible_solutions "${commands[@]}"
echo "Executing: ${command[$possible_solutions_ret]}"
eval ${commands[$possible_solutions_ret]}
elif [ x"$1" = x"linux" ]; then
- commands[0]="su -c \"$pcman install cmake\""
- commands[1]="sudo $pcman install cmake"
+ commands[0]="su -c \"$pcman install gfortran\""
+ commands[1]="sudo $pcman install gfortran"
possible_solutions "${commands[@]}"
echo "Executing: ${command[$possible_solutions_ret]}"
eval ${commands[$possible_solutions_ret]}
--
GitLab