Skip to content

Commit 5a97b64

Browse files
committed
Fixed dependencies in shared libs
1 parent 929820f commit 5a97b64

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
armeabi
22
armeabi-v7a
3+
mips
4+
x86

build.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ cd $BUILDDIR/$ARCH
9292
cd ..
9393
} || exit 1
9494

95+
sed -i "s@LD_SONAME *=.*@LD_SONAME =@g" config/mh-linux
96+
sed -i "s%ln -s *%cp -f \$(dir \$@)/%g" config/mh-linux
97+
9598
env CFLAGS="-I$NDK/sources/android/support/include -frtti -fexceptions" \
9699
LDFLAGS="-frtti -fexceptions" \
97100
LIBS="-L$BUILDDIR/$ARCH -landroid_support -lgnustl_static -lstdc++" \
@@ -104,19 +107,21 @@ cd $BUILDDIR/$ARCH
104107
--with-data-packaging=archive \
105108
|| exit 1
106109

110+
sed -i "s@^prefix *= *.*@prefix = .@" icudefs.mk || exit 1
111+
107112
env PATH=`pwd`:$PATH \
108113
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
109114
make -j$NCPU VERBOSE=1 || exit 1
110115

116+
sed -i "s@^prefix *= *.*@prefix = `pwd`/../../@" icudefs.mk || exit 1
117+
111118
env PATH=`pwd`:$PATH \
112119
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
113120
make V=1 install || exit 1
114121

115-
#cp -f -a share ../../
116-
117-
for f in libicudata libicui18n libicuio libicule libiculx libicutu libicuuc; do
118-
cp -f lib/$f.so ../../
119-
cp -f lib/$f.a ../../
122+
for f in libicudata libicutest libicui18n libicuio libicule libiculx libicutu libicuuc; do
123+
cp -f -H ../../lib/$f.so ../../
124+
cp -f ../../lib/$f.a ../../
120125
$BUILDDIR/setCrossEnvironment-$ARCH.sh \
121126
sh -c '$STRIP'" ../../$f.so"
122127
done

0 commit comments

Comments
 (0)