File tree Expand file tree Collapse file tree 2 files changed +56
-0
lines changed
swift-android-source-patches Expand file tree Collapse file tree 2 files changed +56
-0
lines changed Original file line number Diff line number Diff line change 1+ --- build.sh 2018-01-19 09:56:47.000000000 -0800
2+ +++ build.sh.new 2018-01-19 09:56:38.000000000 -0800
3+ @@ -77,11 +77,11 @@
4+
5+ # =========== libicuXX.so ===========
6+
7+ - [ -e libicuuc.so ] || {
8+ + [ -e libicuucswifswiftt.so ] || {
9+
10+ - [ -e ../icu4c-55_1-src.tgz ] || exit 1
11+ + # [ -e ../icu4c-55_1-src.tgz ] || exit 1
12+
13+ - tar xvf ../icu4c-55_1-src.tgz
14+ + # tar xvf ../icu4c-55_1-src.tgz
15+
16+ cd icu/source
17+
18+ @@ -104,6 +104,7 @@
19+ ./configure \
20+ --host=arm-linux-androideabi \
21+ --prefix=`pwd`/../../ \
22+ + --with-library-suffix=swift \
23+ --with-cross-build=`pwd`/cross \
24+ --enable-static --enable-shared \
25+ || exit 1
26+ @@ -119,7 +120,7 @@
27+ $BUILDDIR/setCrossEnvironment-$ARCH.sh \
28+ make V=1 install || exit 1
29+
30+ - for f in libicudata libicutest libicui18n libicuio libicule libiculx libicutu libicuuc; do
31+ + for f in libicudataswift libicutestswift libicui18nswift libicuioswift libiculeswift libiculxswift libicutuswift libicuucswift; do
32+ cp -f -H ../../lib/$f.so ../../
33+ cp -f ../../lib/$f.a ../../
34+ $BUILDDIR/setCrossEnvironment-$ARCH.sh \
Original file line number Diff line number Diff line change 1+ --- armeabi-v7a/icu/source/configure 2018-01-18 17:31:55.000000000 -0800
2+ +++ armeabi-v7a/icu/source/configure.new 2018-01-18 17:33:27.000000000 -0800
3+ @@ -7599,14 +7599,14 @@
4+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
5+ $as_echo "$msg" >&6; }
6+
7+ - if test "$ICULIBSUFFIX" != ""
8+ - then
9+ - U_HAVE_LIB_SUFFIX=1
10+ - ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/^A-Za-z0-9_/_/g'`
11+ - UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} "
12+ - else
13+ - U_HAVE_LIB_SUFFIX=0
14+ - fi
15+ + # if test "$ICULIBSUFFIX" != ""
16+ + # then
17+ + # U_HAVE_LIB_SUFFIX=1
18+ + # ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/^A-Za-z0-9_/_/g'`
19+ + # UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} "
20+ + # else
21+ + U_HAVE_LIB_SUFFIX=0
22+ + # fi
You can’t perform that action at this time.
0 commit comments