Skip to content

Commit

Permalink
Merge pull request #4 from andriydruk/master
Browse files Browse the repository at this point in the history
Resolve ICU soname issue
  • Loading branch information
modocache authored Aug 10, 2017
2 parents 3db7380 + 212c415 commit 877921d
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ cd $BUILDDIR/$ARCH
cd ..
} || exit 1

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

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

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

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

sed -i.tmp "s@^prefix *= *.*@prefix = `pwd`/../../@" icudefs.mk || exit 1

env PATH=`pwd`:$PATH \
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
make V=1 install || exit 1
Expand Down

0 comments on commit 877921d

Please sign in to comment.