|
| 1 | +diff --git a/build.sh b/build.sh |
| 2 | +index 3d273a8..c13c4d9 100755 |
| 3 | +--- a/build.sh |
| 4 | ++++ b/build.sh |
| 5 | +@@ -77,11 +77,11 @@ cd $BUILDDIR/$ARCH |
| 6 | + |
| 7 | + # =========== libicuXX.so =========== |
| 8 | + |
| 9 | +-[ -e libicuuc.so ] || { |
| 10 | ++[ -e libicuucswifswiftt.so ] || { |
| 11 | + |
| 12 | +- [ -e ../icu4c-55_1-src.tgz ] || exit 1 |
| 13 | ++# [ -e ../icu4c-55_1-src.tgz ] || exit 1 |
| 14 | + |
| 15 | +- tar xvf ../icu4c-55_1-src.tgz |
| 16 | ++# tar xvf ../icu4c-55_1-src.tgz |
| 17 | + |
| 18 | + cd icu/source |
| 19 | + |
| 20 | +@@ -104,6 +104,7 @@ cd $BUILDDIR/$ARCH |
| 21 | + ./configure \ |
| 22 | + --host=arm-linux-androideabi \ |
| 23 | + --prefix=`pwd`/../../ \ |
| 24 | ++ --with-library-suffix=swift \ |
| 25 | + --with-cross-build=`pwd`/cross \ |
| 26 | + --enable-static --enable-shared \ |
| 27 | + || exit 1 |
| 28 | +@@ -119,7 +120,7 @@ cd $BUILDDIR/$ARCH |
| 29 | + $BUILDDIR/setCrossEnvironment-$ARCH.sh \ |
| 30 | + make V=1 install || exit 1 |
| 31 | + |
| 32 | +- for f in libicudata libicutest libicui18n libicuio libicule libiculx libicutu libicuuc; do |
| 33 | ++ for f in libicudataswift libicutestswift libicui18nswift libicuioswift libiculeswift libiculxswift libicutuswift libicuucswift; do |
| 34 | + cp -f -H ../../lib/$f.so ../../ |
| 35 | + cp -f ../../lib/$f.a ../../ |
| 36 | + $BUILDDIR/setCrossEnvironment-$ARCH.sh \ |
| 37 | +diff -u a/armeabi-v7a/icu/source/configure b/armeabi-v7a/icu/source/configure |
| 38 | +@@ -7599,14 +7599,14 @@ |
| 39 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5 |
| 40 | + $as_echo "$msg" >&6; } |
| 41 | + |
| 42 | +-if test "$ICULIBSUFFIX" != "" |
| 43 | +-then |
| 44 | +- U_HAVE_LIB_SUFFIX=1 |
| 45 | +- ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/^A-Za-z0-9_/_/g'` |
| 46 | +- UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} " |
| 47 | +-else |
| 48 | +- U_HAVE_LIB_SUFFIX=0 |
| 49 | +-fi |
| 50 | ++# if test "$ICULIBSUFFIX" != "" |
| 51 | ++# then |
| 52 | ++# U_HAVE_LIB_SUFFIX=1 |
| 53 | ++# ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/^A-Za-z0-9_/_/g'` |
| 54 | ++# UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} " |
| 55 | ++# else |
| 56 | ++U_HAVE_LIB_SUFFIX=0 |
| 57 | ++# fi |
0 commit comments