add suffix to icu libraries

Author: lanza

build.sh

@@ -172,12 +172,19 @@ cd $BUILDDIR/$ARCH
 
 cd $BUILDDIR/$ARCH
 
-[ -e libicuuc.a ] || [ -e libicuuc.so ] || [ $SKIP_ICUUC ] {
+[ -e libicuuc$LIBSUFFIX.a ] || [ -e libicuuc$LIBSUFFIX.so ] || [ $SKIP_ICUUC ] || {
 
 	rm -rf icu
 
 	tar xvf ../icu4c-59_1-src.tgz
 
+  # The ENVVAR LIBSUFFIX should add the suffix only to the libname and not to the symbols.
+  # ToDo: Find the right way in Swift to refer to an alternative library with symbol prefixing or any other method to
+  # remove this.
+  if [ $LIBSUFFIX ]; then
+    patch -p0 < ../patches/icu_suffix_only_on_libname.patch
+  fi
+
 	cd icu/source
 
 	cp -f $BUILDDIR/config.sub .
@@ -208,6 +215,7 @@ cd $BUILDDIR/$ARCH
 		./configure \
 		--host=$GCCPREFIX \
 		--prefix=`pwd`/../../ \
+		--with-library-suffix=$LIBSUFFIX \
 		--with-cross-build=`pwd`/cross \
 		$libtype \
 		--with-data-packaging=archive \
@@ -229,7 +237,7 @@ cd $BUILDDIR/$ARCH
 		$BUILDDIR/setCrossEnvironment-$ARCH.sh \
 		make V=1 install || exit 1
 
-	for f in libicudata libicutest libicui18n libicuio libicutu libicuuc; do
+	for f in libicudata$LIBSUFFIX libicutest$LIBSUFFIX libicui18n$LIBSUFFIX libicuio$LIBSUFFIX libicutu$LIBSUFFIX libicuuc$LIBSUFFIX; do
 		if [ $SHARED_ICU ]; then
 			cp -f -H ../../lib/$f.so ../../
 		else
@@ -270,12 +278,15 @@ cd $BUILDDIR/$ARCH
 		--enable-static --enable-shared \
 		|| exit 1
 
+	cmd='$LD $CFLAGS -shared src/.libs/*.o -o src/.libs/libicu-le-hb.so.0.0.0 -L../lib -lharfbuzz $LDFLAGS'
+	cmd="$cmd -licuuc$LIBSUFFIX"
+
 	env PATH=`pwd`:$PATH \
 		$BUILDDIR/setCrossEnvironment-$ARCH.sh \
 		make V=1 || \
 		env PATH=`pwd`:$PATH \
 		$BUILDDIR/setCrossEnvironment-$ARCH.sh \
-		sh -c '$LD $CFLAGS -shared src/.libs/*.o -o src/.libs/libicu-le-hb.so.0.0.0 -L../lib -lharfbuzz -licuuc $LDFLAGS' || exit 1
+		sh -c "$cmd" || exit 1
 
 	env PATH=`pwd`:$PATH \
 		$BUILDDIR/setCrossEnvironment-$ARCH.sh \

patches/icu_suffix_only_on_libname.patch

@@ -0,0 +1,18 @@
+--- icu/source/configure	2013-05-23 20:06:32.000000000 +0000
++++ icu/source/configure.patched	2018-02-21 23:35:25.934967613 +0000
+@@ -7217,14 +7217,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5
+ $as_echo "$msg" >&6; }
+ 
+-if test "$ICULIBSUFFIX" != ""
+-then
+-    U_HAVE_LIB_SUFFIX=1
+-    ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/^A-Za-z0-9_/_/g'`
+-    UCONFIG_CPPFLAGS="${UCONFIG_CPPFLAGS} -DU_HAVE_LIB_SUFFIX=1 -DU_LIB_SUFFIX_C_NAME=${ICULIBSUFFIXCNAME} "
+-else
+-    U_HAVE_LIB_SUFFIX=0
+-fi
++U_HAVE_LIB_SUFFIX=0
+ 
+ 
+