From e43d58994ba93fec923ea4f67a63677f1bec3868 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Fri, 27 Sep 2019 14:24:15 +0200
Subject: [PATCH] macOS build: build Boost with same custom iconv as rest of
 MKVToolNix

---
 Rakefile                 | 6 +++---
 packaging/macos/build.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Rakefile b/Rakefile
index db7297926..816a578da 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1035,15 +1035,15 @@ end
 
 # libraries required for all programs via mtxcommon
 $common_libs = [
+  :boost_filesystem,
+  :boost_regex,
+  :boost_system,
   :magic,
   :flac,
   :z,
   :pugixml,
   :intl,
   :iconv,
-  :boost_regex,
-  :boost_filesystem,
-  :boost_system,
   :fmt,
 ]
 
diff --git a/packaging/macos/build.sh b/packaging/macos/build.sh
index fb53026f6..c8324507a 100755
--- a/packaging/macos/build.sh
+++ b/packaging/macos/build.sh
@@ -243,7 +243,7 @@ function build_gettext {
 function build_boost {
   local -a args properties
 
-  args=(--reconfigure -sICONV_PATH=/usr -j$DRAKETHREADS --prefix=TMPDIR/${TARGET} --libdir=TMPDIR/${TARGET}/lib)
+  args=(--reconfigure -sICONV_PATH=${TARGET} -j$DRAKETHREADS --prefix=TMPDIR/${TARGET} --libdir=TMPDIR/${TARGET}/lib)
   properties=(toolset=clang link=static variant=release)
   if [[ -n $CXXFLAGS ]] properties+=(cxxflags="${(q)CXXFLAGS}")
   if [[ -n $LDFLAGS  ]] properties+=(linkflags="${(q)LDFLAGS}")