Kill bitrot Emscripten experiment

Change-Id: I1cd5331157e684afb01e6555168ce646194c6ff2
Reviewed-on: https://gerrit.libreoffice.org/34493
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>

3 files changed, 1 insertions, 118 deletions

diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 646b10b40155..205817938539 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -64,7 +64,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 			--disable-layout --disable-samples \
 			$(if $(CROSS_COMPILING),--disable-tools --disable-extras) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
-			$(if $(filter ANDROID EMSCRIPTEN,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
+			$(if $(filter ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
 			$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
 				--with-data-packaging=static --enable-static --disable-shared --disable-dyload,\
diff --git a/external/icu/UnpackedTarball_icu.mk b/external/icu/UnpackedTarball_icu.mk
index 0e4a6455a0a3..194c8eb563c2 100644
--- a/external/icu/UnpackedTarball_icu.mk
+++ b/external/icu/UnpackedTarball_icu.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,icu,\
 	external/icu/rtti.patch.0 \
 	external/icu/clang-cl.patch.0 \
 	$(if $(filter-out ANDROID,$(OS)),external/icu/icu4c-icudata-stdlibs.diff) \
-	$(if $(filter EMSCRIPTEN,$(OS)),external/icu/icu4c-emscripten.patch.1) \
 	external/icu/khmerbreakengine.patch \
 ))
 
diff --git a/external/icu/icu4c-emscripten.patch.1 b/external/icu/icu4c-emscripten.patch.1
deleted file mode 100644
index 3ce6d527b5cd..000000000000
--- a/external/icu/icu4c-emscripten.patch.1
+++ /dev/null
@@ -1,116 +0,0 @@
---- icu.org/source/config/mh-unknown	2015-10-06 11:35:03.212459286 +0200
-+++ icu/source/config/mh-unknown	2015-10-06 12:01:00.497972406 +0200
-@@ -1,27 +1,90 @@
- ## -*-makefile-*-
--## Copyright (c) 2003, International Business Machines Corporation and
-+## Emscripten-specific setup
-+## Copyright (c) 1999-2013, International Business Machines Corporation and
- ## others. All Rights Reserved.
--##
- 
--# Note, this is not a real mh- file. You got here because configure
--# (specifically, aclocal.m4) could not determine a suitable mh- file.
--#
--# Perhaps your platform wasn't detected- try changing aclocal.m4 and
--# re-running autoconf. 
--#
--# If your platform is truly new/different:
--# As a start, try copying mh-linux (which is fairly generic) over this
--# file, and re-run config.status.
--
--%.$(STATIC_O) %.o %.$(STATIC_O) %.o ../data/%.o %.d %.d %.$(SO).$(SO_TARGET_VERSION_MAJOR) %.$(SO):
--	@echo 
--	@echo 
--	@echo "*** ERROR - configure could not detect your platform"
--	@echo "*** see the readme.html"
--	@echo "*** or, try copying icu/source/config/mh-linux to mh-unknown"
--	@echo "***   and editing it."
--	@echo 
--	@echo 
--	exit 1
-+## Commands to generate dependency files
-+GEN_DEPS.c=  $(CC) -E -MM $(DEFS) $(CPPFLAGS)
-+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS) $(CXXFLAGS)
- 
-+## Flags for position independent code
-+SHAREDLIBCFLAGS = -fPIC
-+SHAREDLIBCXXFLAGS = -fPIC
-+SHAREDLIBCPPFLAGS = -DPIC
- 
-+## Additional flags when building libraries and with threads
-+THREADSCPPFLAGS = -D_REENTRANT
-+LIBCPPFLAGS =
-+
-+## Compiler switch to embed a runtime search path
-+LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN
-+LD_RPATH_PRE = -Wl,-rpath,
-+
-+## Force RPATH=$ORIGIN to locate own dependencies w/o need for LD_LIBRARY_PATH:
-+ENABLE_RPATH=YES
-+RPATHLDFLAGS=${LD_RPATH_PRE}'$$ORIGIN'
-+
-+## These are the library specific LDFLAGS
-+#LDFLAGSICUDT=-nodefaultlibs -nostdlib
-+# Debian change: linking icudata as data only causes too many problems.
-+LDFLAGSICUDT=
-+
-+## Compiler switch to embed a library name
-+# The initial tab in the next line is to prevent icu-config from reading it.
-+	LD_SONAME = -Wl,-soname -Wl,$(notdir $(MIDDLE_SO_TARGET))
-+#SH# # We can't depend on MIDDLE_SO_TARGET being set.
-+#SH# LD_SONAME=
-+
-+## Shared library options
-+LD_SOOPTIONS= -Wl,-Bsymbolic-functions
-+
-+## Shared object suffix
-+SO = so
-+## Non-shared intermediate object suffix
-+STATIC_O = ao
-+
-+## Compilation rules
-+%.$(STATIC_O): $(srcdir)/%.c
-+	$(call SILENT_COMPILE,$(strip $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS)) -o $@ $<)
-+%.o: $(srcdir)/%.c
-+	$(call SILENT_COMPILE,$(strip $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS)) -o $@ $<)
-+
-+%.$(STATIC_O): $(srcdir)/%.cpp
-+	$(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS)) -o $@ $<)
-+%.o: $(srcdir)/%.cpp
-+	$(call SILENT_COMPILE,$(strip $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS)) -o $@ $<)
-+
-+
-+## Dependency rules
-+%.d: $(srcdir)/%.c
-+	$(call ICU_MSG,(deps)) $<
-+	@$(SHELL) -ec '$(GEN_DEPS.c) $< \
-+		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
-+		[ -s $@ ] || rm -f $@'
-+
-+%.d: $(srcdir)/%.cpp
-+	$(call ICU_MSG,(deps)) $<
-+	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
-+		| sed '\''s%\($*\)\.o[ :]*%\1.o $@ : %g'\'' > $@; \
-+		[ -s $@ ] || rm -f $@'
-+
-+## Versioned libraries rules
-+
-+%.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
-+	$(RM) $@ && ln -s ${<F} $@
-+%.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
-+	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
-+
-+##  Bind internal references
-+
-+# LDflags that pkgdata will use
-+BIR_LDFLAGS= -Wl,-Bsymbolic
-+
-+# Dependencies [i.e. map files] for the final library
-+BIR_DEPS=
-+
-+## Remove shared library 's'
-+STATIC_PREFIX_WHEN_USED =
-+STATIC_PREFIX =
-+
-+## End Linux-specific setup
-