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
159159
160160cd $BUILDDIR /$ARCH
161161
162- [ -e libicuuc.a ] || {
162+ [ -e libicuuc$LIBSUFFIX .a ] || {
163163
164164 rm -rf icu
165165
166166 [ -e ../icu4c-55_1-src.tgz ] || exit 1
167167
168168 tar xvf ../icu4c-55_1-src.tgz
169169
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+
170176 cd icu/source
171177
172178 # cp -f $BUILDDIR/config.sub .
@@ -189,6 +195,7 @@ cd $BUILDDIR/$ARCH
189195 ./configure \
190196 --host=$GCCPREFIX \
191197 --prefix=` pwd` /../../ \
198+ --with-library-suffix=$LIBSUFFIX \
192199 --with-cross-build=` pwd` /cross \
193200 --enable-static --disable-shared \
194201 || exit 1
@@ -208,7 +215,7 @@ cd $BUILDDIR/$ARCH
208215 $BUILDDIR /setCrossEnvironment-$ARCH .sh \
209216 make V=1 install || exit 1
210217
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
212219 # cp -f -H ../../lib/$f.so ../../
213220 cp -f ../../lib/$f .a ../../
214221 # $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