Skip to content

Commit 877921d

Browse files
authored
Merge pull request #4 from andriydruk/master
Resolve ICU soname issue
2 parents 3db7380 + 212c415 commit 877921d

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

build.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ cd $BUILDDIR/$ARCH
9696
cd ..
9797
} || exit 1
9898

99-
sed -i.tmp "s@LD_SONAME *=.*@LD_SONAME =@g" config/mh-linux
100-
sed -i.tmp "s%ln -s *%cp -f \$(dir \$@)/%g" config/mh-linux
10199

102100
env CFLAGS="-I$NDK/sources/android/support/include -frtti -fexceptions" \
103101
LDFLAGS="-frtti -fexceptions" \
@@ -110,14 +108,13 @@ cd $BUILDDIR/$ARCH
110108
--enable-static --enable-shared \
111109
|| exit 1
112110

113-
sed -i.tmp "s@^prefix *= *.*@prefix = .@" icudefs.mk || exit 1
111+
sed -i.tmp 's/.$(SO_TARGET_VERSION_MAJOR)//' icudefs.mk
112+
sed -i.tmp 's/$(PKGDATA_VERSIONING) -e/-e/' data/Makefile
114113

115114
env PATH=`pwd`:$PATH \
116115
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
117116
make -j$NCPU VERBOSE=1 || exit 1
118117

119-
sed -i.tmp "s@^prefix *= *.*@prefix = `pwd`/../../@" icudefs.mk || exit 1
120-
121118
env PATH=`pwd`:$PATH \
122119
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
123120
make V=1 install || exit 1

0 commit comments

Comments
 (0)