From 9e88a0c7b87a2bd45a59db7cfe247a29fdbb154d Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 13 Aug 2013 20:35:40 -0400
Subject: [PATCH] fix icu build (tested on MacOSX)

---
 osx/scripts/build_icu.sh | 9 ++++-----
 osx/settings.sh          | 4 ++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/osx/scripts/build_icu.sh b/osx/scripts/build_icu.sh
index 60a2cf5f..314df4e5 100755
--- a/osx/scripts/build_icu.sh
+++ b/osx/scripts/build_icu.sh
@@ -26,20 +26,19 @@ if [ $BOOST_ARCH = "arm" ]; then
 else
     export CROSS_FLAGS=""
 fi
+# note: enable-draft is needed for U_ICUDATA_ENTRY_POINT
 ./configure ${HOST_ARG} ${CROSS_FLAGS} --prefix=${BUILD} \
---disable-samples \
+--enable-draft \
 --enable-static \
---disable-shared \
 --with-data-packaging=archive \
+--disable-shared \
 --disable-tests \
---enable-tests=no \
 --disable-extras \
 --disable-layout \
---disable-draft \
 --disable-icuio \
 --disable-samples \
 --disable-dyload
-make -j${JOBS} -i -k
+make -j${JOBS}
 make install
 export LDFLAGS=${OLD_LDFLAGS}
 export CPPFLAGS=${OLD_CPPFLAGS}
diff --git a/osx/settings.sh b/osx/settings.sh
index f0ccb5aa..8ff1a70b 100644
--- a/osx/settings.sh
+++ b/osx/settings.sh
@@ -20,6 +20,8 @@ if [ ${PLATFORM} = 'Linux' ]; then
     export EXTRA_LDFLAGS=
     export CORE_CC="gcc"
     export CORE_CXX="g++"
+    export AR=
+    export RANLIB=
     export JOBS=`grep -c ^processor /proc/cpuinfo`
     export BOOST_TOOLSET="gcc"
     export CXX_VISIBILITY_FLAGS="-fvisibility-inlines-hidden"
@@ -86,6 +88,8 @@ elif [ ${UNAME} = 'Darwin' ]; then
     export PATH=${TOOLCHAIN_ROOT}:$PATH
     export CORE_CC="${TOOLCHAIN_ROOT}/clang"
     export CORE_CXX="${XCODE_PREFIX}/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++"
+    export AR=
+    export RANLIB=
     export SDK_ROOT="${XCODE_PREFIX}/Platforms/${PLATFORM}.platform/Developer"
     # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer
     export PLATFORM_SDK="${PLATFORM}${MIN_SDK_VERSION}.sdk"