From c70684e6544a9c577ec00640528d2ca90393a640 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 30 Jun 2024 17:33:54 +0200 Subject: [PATCH] (macOS) Added libiconv as a dependency library --- tools/macOS_dependencies_build.sh | 17 ++++++++++++++++- tools/macOS_dependencies_setup.sh | 13 +++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/tools/macOS_dependencies_build.sh b/tools/macOS_dependencies_build.sh index b6a985172..a04f446aa 100755 --- a/tools/macOS_dependencies_build.sh +++ b/tools/macOS_dependencies_build.sh @@ -33,6 +33,21 @@ echo "Building all dependencies in the ./external directory...\n" export PKG_CONFIG_PATH=$(pwd)/../local_install/lib/pkgconfig +echo "Building libiconv" + +if [ ! -d libiconv ]; then + echo "libiconv directory is missing, aborting." + exit +fi + +cd libiconv + +./configure --enable-static=yes --enable-shared=no --prefix=$(pwd)/../local_install +make clean +make -j${JOBS} +make install +cd .. + echo "Building gettext" if [ ! -d gettext ]; then @@ -42,7 +57,7 @@ fi cd gettext -./configure --prefix=$(pwd)/../local_install +./configure --with-libiconv-prefix=$(pwd)/../local_install --prefix=$(pwd)/../local_install make clean make -j${JOBS} diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index 864e1499b..96dab2613 100755 --- a/tools/macOS_dependencies_setup.sh +++ b/tools/macOS_dependencies_setup.sh @@ -21,6 +21,19 @@ cd external rm -rf local_install mkdir local_install +echo "Setting up libiconv" +rm -rf libiconv* +curl -LO https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz +tar xvzf libiconv-1.17.tar.gz + +if [ ! -d libiconv-1.17 ]; then + echo "libiconv directory is missing, aborting." + exit +fi + +mv libiconv-1.17 libiconv +rm libiconv-1.17.tar.gz + echo "Setting up gettext" rm -rf gettext* curl -LO https://ftp.gnu.org/pub/gnu/gettext/gettext-0.22.5.tar.gz