From 3f062dfe33fcc0c27192617842d11388a20956db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dami=C3=A1n=20Parrino?= Date: Wed, 22 Sep 2021 16:34:26 -0300 Subject: [PATCH] Add lib paths on Apple M1 (arm64) (#113) * Update lib checks --- depends/check-gmp.sh | 2 +- depends/check-libelf.sh | 2 +- depends/check-ncurses.sh | 2 +- depends/check-zlib.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/depends/check-gmp.sh b/depends/check-gmp.sh index a7ae9cfb9..1874a5af4 100755 --- a/depends/check-gmp.sh +++ b/depends/check-gmp.sh @@ -1,4 +1,4 @@ #!/bin/sh # check-gmp.sh by Timothy Redaelli (timothy@redaelli.eu) -[ -f /usr/include/$(gcc -dumpmachine)/gmp.h -o -f /usr/include/gmp.h -o -f /opt/local/include/gmp.h -o -f /usr/local/include/gmp.h -o -f /opt/csw/include/gmp.h ] || { echo "ERROR: Install gmp before continuing."; exit 1; } +[ -f /usr/include/$(gcc -dumpmachine)/gmp.h -o -f /usr/include/gmp.h -o -f /opt/local/include/gmp.h -o -f /usr/local/include/gmp.h -o -f /opt/csw/include/gmp.h ] || pkg-config --exists gmp || { echo "ERROR: Install gmp before continuing."; exit 1; } diff --git a/depends/check-libelf.sh b/depends/check-libelf.sh index b1049965c..84daea65f 100755 --- a/depends/check-libelf.sh +++ b/depends/check-libelf.sh @@ -1,4 +1,4 @@ #!/bin/sh # check-libelf.sh by Naomi Peori (naomi@peori.ca) -( ls /usr/include/libelf.h || ls /usr/local/include/libelf.h || ls /opt/local/include/libelf.h || ls /opt/local/include/libelf/libelf.h || ls /usr/local/include/libelf/libelf.h ) 1>/dev/null 2>&1 || { echo "ERROR: Install libelf before continuing."; exit 1; } +( ls /usr/include/libelf.h || ls /usr/local/include/libelf.h || ls /opt/local/include/libelf.h || ls /opt/local/include/libelf/libelf.h || ls /usr/local/include/libelf/libelf.h ) 1>/dev/null 2>&1 || pkg-config --exists libelf || { echo "ERROR: Install libelf before continuing."; exit 1; } diff --git a/depends/check-ncurses.sh b/depends/check-ncurses.sh index c247c6040..adf740e9d 100755 --- a/depends/check-ncurses.sh +++ b/depends/check-ncurses.sh @@ -1,4 +1,4 @@ #!/bin/sh # check-ncurses.sh by Naomi Peori (naomi@peori.ca) -( ls /usr/include/ncurses.h || ls /usr/include/ncurses/ncurses.h || ls /opt/local/include/ncurses.h || ls /usr/include/curses.h || ls /mingw/include/curses.h || ls /usr/local/opt/ncurses/include/ncurses.h ) 1>/dev/null 2>&1 || { echo "ERROR: Install ncurses before continuing."; exit 1; } +( ls /usr/include/ncurses.h || ls /usr/include/ncurses/ncurses.h || ls /opt/local/include/ncurses.h || ls /usr/include/curses.h || ls /mingw/include/curses.h || ls /usr/local/opt/ncurses/include/ncurses.h ) 1>/dev/null 2>&1 || pkg-config --exists ncurses || { echo "ERROR: Install ncurses before continuing."; exit 1; } diff --git a/depends/check-zlib.sh b/depends/check-zlib.sh index 21032e832..930d6b0f4 100755 --- a/depends/check-zlib.sh +++ b/depends/check-zlib.sh @@ -1,4 +1,4 @@ #!/bin/sh # check-zlib.sh by Naomi Peori (naomi@peori.ca) -( ls /usr/include/zlib.h || ls /opt/local/include/zlib.h || ls /usr/local/opt/zlib/include/zlib.h ) 1>/dev/null 2>&1 || { echo "ERROR: Install zlib before continuing."; exit 1; } +( ls /usr/include/zlib.h || ls /opt/local/include/zlib.h || ls /usr/local/opt/zlib/include/zlib.h ) 1>/dev/null 2>&1 || pkg-config --exists zlib || { echo "ERROR: Install zlib before continuing."; exit 1; }