From 1e4e15846ae57a39d5b2dae49e2fa9e8cb83ce91 Mon Sep 17 00:00:00 2001 From: KNikola Date: Mon, 10 Dec 2018 10:07:11 +0100 Subject: [PATCH] added MacOS libffi dependency, changed MacOS gdal installation command --- check_libs.mk | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/check_libs.mk b/check_libs.mk index 66258b7..fcb8432 100644 --- a/check_libs.mk +++ b/check_libs.mk @@ -14,16 +14,16 @@ else endif endif -.PHONY: gdal xmlsec +.PHONY: gdal xmlsec libffi -check_libs: gdal xmlsec +check_libs: gdal xmlsec libffi gdal: ifeq ($(GDAL_AVAILABLE),) @echo "${RED}--------------------------------------------------------------------------------------------${NC}" @echo "---> ${RED}GDAL not found. Please use the command below to install it. ${NC}\n" ifeq ($(CCFLAGS),OSX) - @echo "\t${RED}brew install gdal --HEAD${NC}" + @echo "\t${RED}brew install gdal${NC}" endif ifeq ($(CCFLAGS),LINUX) @echo "\t${RED}sudo add-apt-repository ppa:ubuntugis/ppa; sudo apt-get update; sudo apt-get install gdal-bin && sudo apt-get -y install python-gdal${NC}" @@ -45,7 +45,7 @@ ifeq ($(shell brew ls --versions libxmlsec1),) @echo "${RED}--------------------------------------------------------------------------------------------${NC}" exit 1 else - @echo "Found xmlsec. Skipping" + @echo "Found xmlsec version: $(shell brew ls --versions libxmlsec1). Skipping" endif endif ifeq ($(CCFLAGS),LINUX) @@ -83,4 +83,18 @@ ifeq ($(shell dpkg-query --list | grep libxmlsec1-dev),) else @echo "Found xmlsec. Skipping" endif +endif + +libffi: +ifeq ($(CCFLAGS),OSX) +ifeq ($(shell brew ls --versions libffi),) + @echo "${RED}--------------------------------------------------------------------------------------------${NC}" + @echo "---> ${RED}LIBFFI not found. Please use the command below to install it. ${NC}\n" + @echo "\t${RED}brew install libffi${NC}" + @echo "" + @echo "${RED}--------------------------------------------------------------------------------------------${NC}" +exit 1 +else + @echo "Found libffi version: $(shell brew ls --versions libffi). Skipping" +endif endif \ No newline at end of file -- GitLab