File tree Expand file tree Collapse file tree 2 files changed +27
-2
lines changed Expand file tree Collapse file tree 2 files changed +27
-2
lines changed Original file line number Diff line number Diff line change @@ -159,14 +159,20 @@ cd $BUILDDIR/$ARCH
159
159
160
160
cd $BUILDDIR /$ARCH
161
161
162
- [ -e libicuuc.a ] || {
162
+ [ -e libicuuc$LIBSUFFIX .a ] || {
163
163
164
164
rm -rf icu
165
165
166
166
[ -e ../icu4c-55_1-src.tgz ] || exit 1
167
167
168
168
tar xvf ../icu4c-55_1-src.tgz
169
169
170
+ # The ENVVAR LIBSUFFIX should add the suffix only to the libname and not to the symbols.
171
+ # ToDo: Find the right way in Swift to refer to an alternative library with symbol prefixing or any other method to remove this.
172
+ if $[ -n " $LIBSUFFIX " ]; then
173
+ patch -p0 < ../patches/icu_suffix_only_on_libname.patch
174
+ fi
175
+
170
176
cd icu/source
171
177
172
178
# cp -f $BUILDDIR/config.sub .
@@ -189,6 +195,7 @@ cd $BUILDDIR/$ARCH
189
195
./configure \
190
196
--host=$GCCPREFIX \
191
197
--prefix=` pwd` /../../ \
198
+ --with-library-suffix=$LIBSUFFIX \
192
199
--with-cross-build=` pwd` /cross \
193
200
--enable-static --disable-shared \
194
201
|| exit 1
@@ -208,7 +215,7 @@ cd $BUILDDIR/$ARCH
208
215
$BUILDDIR /setCrossEnvironment-$ARCH .sh \
209
216
make V=1 install || exit 1
210
217
211
- for f in libicudata libicutest libicui18n libicuio libicutu libicuuc; do
218
+ for f in libicudata$LIBSUFFIX libicutest$LIBSUFFIX libicui18n$LIBSUFFIX libicuio$LIBSUFFIX libicule $LIBSUFFIX libiculx $LIBSUFFIX libicutu$LIBSUFFIX libicuuc$LIBSUFFIX ; do
212
219
# cp -f -H ../../lib/$f.so ../../
213
220
cp -f ../../lib/$f .a ../../
214
221
# $BUILDDIR/setCrossEnvironment-$ARCH.sh \
Original file line number Diff line number Diff line change
1
+ --- icu/source/configure 2013-05-23 20:06:32.000000000 +0000
2
+ +++ icu/source/configure.patched 2018-02-21 23:35:25.934967613 +0000
3
+ @@ -7217,14 +7217,7 @@
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
+ + U_HAVE_LIB_SUFFIX=0
16
+
17
+
18
+
You can’t perform that action at this time.
0 commit comments