Skip to content
This repository has been archived by the owner on Apr 12, 2019. It is now read-only.

Commit

Permalink
use an empty icu data library for now - refs #95
Browse files Browse the repository at this point in the history
  • Loading branch information
Dane Springmeyer committed Aug 14, 2013
1 parent 9e88a0c commit af9466b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
Binary file added osx/icudt51l.dat
Binary file not shown.
1 change: 1 addition & 0 deletions osx/scripts/build_icu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if [ $BOOST_ARCH = "arm" ]; then
else
export CROSS_FLAGS=""
fi
cp ${PREMADE_ICU_DATA_LIBRARY} ./data/in/*dat
# note: enable-draft is needed for U_ICUDATA_ENTRY_POINT
./configure ${HOST_ARG} ${CROSS_FLAGS} --prefix=${BUILD} \
--enable-draft \
Expand Down
7 changes: 6 additions & 1 deletion osx/settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ export UNAME=$(uname -s);
# note: -DUCONFIG_NO_BREAK_ITERATION=1 is desired by mapnik (for toTitle)
export ICU_CPP_FLAGS="-DU_CHARSET_IS_UTF8=1 -DU_USING_ICU_NAMESPACE=0 -DU_STATIC_IMPLEMENTATION=1 -DU_TIMEZONE=0 -DUCONFIG_NO_LEGACY_CONVERSION=1 -DUCONFIG_NO_COLLATION=1 -DUCONFIG_NO_FORMATTING=1 -DUCONFIG_NO_TRANSLITERATION=0 -DUCONFIG_NO_REGULAR_EXPRESSIONS=1"

export PREMADE_ICU_DATA_LIBRARY="${ROOTDIR}/icudt51l.dat"

if [ ${PLATFORM} = 'Linux' ]; then
export EXTRA_CFLAGS="-fPIC"
export EXTRA_CXXFLAGS="${EXTRA_CFLAGS}"
export EXTRA_LDFLAGS=
export EXTRA_LDFLAGS="-Wl,-S"
export CORE_CC="gcc"
export CORE_CXX="g++"
export AR=
export RANLIB=
export ARCH_FLAGS=
export JOBS=`grep -c ^processor /proc/cpuinfo`
export BOOST_TOOLSET="gcc"
export CXX_VISIBILITY_FLAGS="-fvisibility-inlines-hidden"
Expand Down Expand Up @@ -57,6 +60,7 @@ elif [ ${PLATFORM} = 'Android' ]; then
alias ldd="arm-linux-androideabi-readelf -d "
export EXTRA_CFLAGS="-fPIC -D_LITTLE_ENDIAN"
export EXTRA_CXXFLAGS="${EXTRA_CFLAGS}"
export EXTRA_LDFLAGS="-Wl,-S"
export JOBS=`sysctl -n hw.ncpu`
export BOOST_TOOLSET="gcc-arm"
export SDK_PATH="${ADT_BUNDLE}/sdk/"
Expand All @@ -66,6 +70,7 @@ elif [ ${PLATFORM} = 'Android' ]; then
export CORE_CC="arm-linux-androideabi-gcc"
export LD="arm-linux-androideabi-ld"
export AR="arm-linux-androideabi-ar"
export ARCH_FLAGS=
export RANLIB="arm-linux-androideabi-ranlib"
# TODO - some builds hardcode libtool which breaks since os x version is used (zlib)
#alias libtool="arm-linux-androideabi-ar cru"
Expand Down

0 comments on commit af9466b

Please sign in to comment.