Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Create source edits .patch
Browse files Browse the repository at this point in the history
AndrewSB committed Jan 19, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent b67d42a commit 3ee32a3
Showing 1 changed file with 57 additions and 0 deletions.
57 changes: 57 additions & 0 deletions swift-android-source-edits.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
diff --git a/build.sh b/build.sh
index 3d273a8..c13c4d9 100755
--- a/build.sh
+++ b/build.sh
@@ -77,11 +77,11 @@ cd $BUILDDIR/$ARCH

# =========== libicuXX.so ===========

-[ -e libicuuc.so ] || {
+[ -e libicuucswifswiftt.so ] || {

- [ -e ../icu4c-55_1-src.tgz ] || exit 1
+# [ -e ../icu4c-55_1-src.tgz ] || exit 1

- tar xvf ../icu4c-55_1-src.tgz
+# tar xvf ../icu4c-55_1-src.tgz

cd icu/source

@@ -104,6 +104,7 @@ cd $BUILDDIR/$ARCH
./configure \
--host=arm-linux-androideabi \
--prefix=`pwd`/../../ \
+ --with-library-suffix=swift \
--with-cross-build=`pwd`/cross \
--enable-static --enable-shared \
|| exit 1
@@ -119,7 +120,7 @@ cd $BUILDDIR/$ARCH
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
make V=1 install || exit 1

- for f in libicudata libicutest libicui18n libicuio libicule libiculx libicutu libicuuc; do
+ for f in libicudataswift libicutestswift libicui18nswift libicuioswift libiculeswift libiculxswift libicutuswift libicuucswift; do
cp -f -H ../../lib/$f.so ../../
cp -f ../../lib/$f.a ../../
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
diff -u a/armeabi-v7a/icu/source/configure b/armeabi-v7a/icu/source/configure
@@ -7599,14 +7599,14 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
$as_echo "$msg" >&6; }

-if test "$ICULIBSUFFIX" != ""
-then
- U_HAVE_LIB_SUFFIX=1
- ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/^A-Za-z0-9_/_/g'`
- UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} "
-else
- U_HAVE_LIB_SUFFIX=0
-fi
+# if test "$ICULIBSUFFIX" != ""
+# then
+# U_HAVE_LIB_SUFFIX=1
+# ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/^A-Za-z0-9_/_/g'`
+# UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} "
+# else
+U_HAVE_LIB_SUFFIX=0
+# fi

0 comments on commit 3ee32a3

Please sign in to comment.