[Libreoffice-commits] core.git: bridges/Module_bridges.mk configure.ac distro-configs/LibreOfficeEmscripten.conf external/icu include/osl include/sal sal/osl solenv/gbuild vcl/CppunitTest_vcl_wmf_test.mk vcl/Library_vcl.mk

Khaled Hosny khaledhosny at eglug.org
Tue Feb 21 09:59:32 UTC 2017 

 bridges/Module_bridges.mk                       |    2 
 configure.ac                                    |   48 +--------
 distro-configs/LibreOfficeEmscripten.conf       |   52 ----------
 external/icu/ExternalProject_icu.mk             |    2 
 external/icu/UnpackedTarball_icu.mk             |    1 
 external/icu/icu4c-emscripten.patch.1           |  116 ------------------------
 include/osl/endian.h                            |    2 
 include/sal/alloca.h                            |    2 
 include/sal/config.h                            |   11 --
 sal/osl/unx/socket.cxx                          |    2 
 sal/osl/unx/system.hxx                          |    5 -
 solenv/gbuild/platform/EMSCRIPTEN_INTEL_emcc.mk |   18 ---
 vcl/CppunitTest_vcl_wmf_test.mk                 |    4 
 vcl/Library_vcl.mk                              |    6 -
 14 files changed, 12 insertions(+), 259 deletions(-)

New commits:
commit 0e21f6619c72f1e17a7b0a52b6317810973d8a3e
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Mon Feb 20 22:57:00 2017 +0200

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

diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index a876f0b..534efda 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -24,7 +24,6 @@ $(eval $(call gb_Module_add_targets,bridges,\
 	) \
 ))
 
-ifneq ($(OS), EMSCRIPTEN)
 ifeq (,$(filter build,$(gb_Module_SKIPTARGETS)))
 ifeq ($(strip $(bridges_SELECTED_BRIDGE)),)
 $(call gb_Output_error,no bridge selected for build: bailing out)
@@ -32,6 +31,5 @@ else ifneq ($(words $(bridges_SELECTED_BRIDGE)),1)
 $(call gb_Output_error,multiple bridges selected for build: $(bridges_SELECTED_BRIDGE))
 endif
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/configure.ac b/configure.ac
index c3b9e94..9259c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -845,27 +845,6 @@ linux-android*)
     BUILD_TYPE="$BUILD_TYPE CAIRO FONTCONFIG FREETYPE"
     ;;
 
-emscripten*)
-    build_gstreamer_1_0=no
-    build_gstreamer_0_10=no
-    enable_lotuswordpro=no
-    enable_mpl_subset=yes
-    enable_coinmp=yes
-    enable_lpsolve=no
-    enable_report_builder=no
-    with_theme="tango"
-    test_cups=no
-    test_dbus=no
-    test_fontconfig=no
-    test_freetype=no
-    test_gtk=no
-    test_tde=no
-    test_kde4=no
-    test_randr=no
-    test_xrender=no
-    _os=Emscripten
-    ;;
-
 *)
     AC_MSG_ERROR([$host_os operating system is not suitable to build LibreOffice for!])
     ;;
@@ -4402,17 +4381,6 @@ linux-android*)
     esac
     ;;
 
-emscripten*)
-    COM=emcc
-    USING_X11=
-    OS=EMSCRIPTEN
-    RTL_OS=Emscripten
-    P_SEP=:
-    CPUNAME=INTEL
-    RTL_ARCH=x86
-    PLATFORMID=linux_x86
-    ;;
-
 *netbsd*)
     COM=GCC
     USING_X11=TRUE
@@ -5530,7 +5498,7 @@ else
 fi
 
 dnl check for GNU C++ compiler version
-if test "$GXX" = "yes" -a "$CXX" != "emcc"; then
+if test "$GXX" = "yes"; then
     AC_MSG_CHECKING([the GNU C++ compiler version])
 
     _gpp_version=`$CXX -dumpversion`
@@ -7548,13 +7516,10 @@ AC_MSG_CHECKING([which zlib to use])
 if test "$with_system_zlib" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_ZLIB=TRUE
-    if test "$_os" != "Emscripten"; then
-        # Emscripten provides its own zlib, don't check for that
-        AC_CHECK_HEADER(zlib.h, [],
-            [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
-        AC_CHECK_LIB(z, deflate, [ ZLIB_LIBS=-lz ],
-            [AC_MSG_ERROR(zlib not found or functional)], [])
-    fi
+    AC_CHECK_HEADER(zlib.h, [],
+        [AC_MSG_ERROR(zlib.h not found. install zlib)], [])
+    AC_CHECK_LIB(z, deflate, [ ZLIB_LIBS=-lz ],
+        [AC_MSG_ERROR(zlib not found or functional)], [])
 else
     AC_MSG_RESULT([internal])
     SYSTEM_ZLIB=
@@ -11579,8 +11544,7 @@ dnl ===================================================================
 ENABLE_LIBLANGTAG=
 SYSTEM_LIBLANGTAG=
 AC_MSG_CHECKING([whether to use liblangtag])
-if test "$enable_liblangtag" = "yes" -o \
-        \( "$enable_liblangtag" = "" -a $_os != Emscripten \); then
+if test "$enable_liblangtag" = "yes" -o "$enable_liblangtag" = ""; then
     ENABLE_LIBLANGTAG=TRUE
     AC_MSG_RESULT([yes])
     AC_MSG_CHECKING([whether to use system liblangtag])
diff --git a/distro-configs/LibreOfficeEmscripten.conf b/distro-configs/LibreOfficeEmscripten.conf
deleted file mode 100644
index 93396c7..0000000
--- a/distro-configs/LibreOfficeEmscripten.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-# Need to specify --host and --build to enable cross-compilation mode
-# See https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Hosts-and-Cross_002dCompilation.html
---host=asmjs-local-emscripten
---build=x86_64-unknown-linux-gnu
-
-# Disable unnecessary stuff
---disable-cups
---disable-dconf
---disable-gio
---disable-dbus
---disable-sdremote-bluetooth
---disable-gstreamer-0-10
---disable-gstreamer-1-0
---disable-liblangtag
---disable-odk
---disable-postgresql-sdbc
---disable-firebird-sdbc
---disable-python
---disable-randr
---disable-pdfimport
---disable-systray
---disable-gltf
---disable-collada
---disable-report-builder
---disable-lpsolve
---disable-coinmp
---disable-orcus
---disable-liblangtag
---without-fonts
---without-java
---without-junit
---without-helppack-integration
---without-system-dicts
---with-theme=no
---with-system-nss
-
-# Build fails when disabling these
-#--disable-cairo-canvas
-#--disable-scripting
-
-# This helps spotting build errors
---with-parallelism=no
-
-# Emscripten doesn't support dynamic loading
---disable-dynamic-loading
-
-# Not sure whether we need this
-#--disable-ccache
-
-# Specify Emscripten compiler
-CC=emcc -v
-CXX=emcc -v
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 646b10b..2058179 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 0e4a645..194c8eb 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 3ce6d52..0000000
--- 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
-
diff --git a/include/osl/endian.h b/include/osl/endian.h
index ca3640b..9a92e25 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -41,8 +41,6 @@ extern "C" {
 #   elif __BYTE_ORDER == __BIG_ENDIAN
 #       define OSL_BIGENDIAN
 #   endif
-#elif defined EMSCRIPTEN
-#   define OSL_LITENDIAN
 #elif defined IOS || defined MACOSX || defined NETBSD
 #   include <machine/endian.h>
 #   if BYTE_ORDER == LITTLE_ENDIAN
diff --git a/include/sal/alloca.h b/include/sal/alloca.h
index 4a817c7..f756acc 100644
--- a/include/sal/alloca.h
+++ b/include/sal/alloca.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SAL_ALLOCA_H
 #define INCLUDED_SAL_ALLOCA_H
 
-#if defined (__sun) || defined (LINUX) || defined(AIX) || defined(ANDROID) || defined(EMSCRIPTEN)
+#if defined (__sun) || defined (LINUX) || defined(AIX) || defined(ANDROID)
 
 #ifndef INCLUDED_ALLOCA_H
 #include <alloca.h>
diff --git a/include/sal/config.h b/include/sal/config.h
index 24612f7..3911db5 100644
--- a/include/sal/config.h
+++ b/include/sal/config.h
@@ -62,17 +62,6 @@
 #define SAL_CONFIGFILE( name ) name "rc"
 #endif
 
-#ifdef EMSCRIPTEN
-#define SAL_UNX
-#define SAL_DLLEXTENSION ".bc"
-#define SAL_EXEEXTENSION ""
-#define SAL_DLLPREFIX "lib"
-#define SAL_PATHSEPARATOR ':'
-#define SAL_PATHDELIMITER '/'
-#define SAL_NEWLINE_STRING "\n"
-#define SAL_CONFIGFILE( name ) name "rc"
-#endif
-
 #ifdef MACOSX
 #define SAL_UNX
 #define SAL_DLLEXTENSION ".dylib"
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 7176431..527663d 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -709,7 +709,7 @@ static struct hostent* osl_gethostbyname_r (
     const char *name, struct hostent *result,
     char *buffer, int buflen, int *h_errnop)
 {
-#if defined(LINUX) || defined(ANDROID) || defined(FREEBSD) || defined(DRAGONFLY) || defined(EMSCRIPTEN)
+#if defined(LINUX) || defined(ANDROID) || defined(FREEBSD) || defined(DRAGONFLY)
     struct hostent *result_; /* will be the same as result */
     int e;
     e = gethostbyname_r (name, result, buffer, buflen,
diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx
index 4b1462c..9fd4a64 100644
--- a/sal/osl/unx/system.hxx
+++ b/sal/osl/unx/system.hxx
@@ -85,7 +85,7 @@
 
 #endif
 
-#if defined(ANDROID) || defined(EMSCRIPTEN)
+#if defined(ANDROID)
 #   include <pthread.h>
 #   include <sys/file.h>
 #   include <sys/ioctl.h>
@@ -242,8 +242,7 @@ int macxp_resolveAlias(char *path, int buflen);
     !defined(AIX)     && \
     !defined(__sun) && !defined(MACOSX) && \
     !defined(OPENBSD) && !defined(DRAGONFLY) && \
-    !defined(IOS) && !defined(ANDROID) && \
-    !defined(EMSCRIPTEN)
+    !defined(IOS) && !defined(ANDROID)
 #   error "Target platform not specified!"
 #endif
 
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_emcc.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_emcc.mk
deleted file mode 100644
index 7619db7..0000000
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_emcc.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-ifeq ($(DISABLE_DYNLOADING),TRUE)
-gb_UnoApiHeadersTarget_select_variant = $(if $(filter udkapi,$(1)),comprehensive,$(2))
-else
-gb_UnoApiHeadersTarget_select_variant = $(2)
-endif
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk
index 737c320..27dfe62 100644
--- a/vcl/CppunitTest_vcl_wmf_test.mk
+++ b/vcl/CppunitTest_vcl_wmf_test.mk
@@ -124,12 +124,8 @@ ifeq ($(ENABLE_HEADLESS),TRUE)
 $(eval $(call gb_CppunitTest_use_externals,vcl_wmf_test,\
     cairo \
     freetype \
-))
-ifneq ($(OS),EMSCRIPTEN)
-$(eval $(call gb_CppunitTest_use_externals,vcl_wmf_test,\
     fontconfig \
 ))
-endif
 else
 ifeq ($(OS),LINUX)
 $(eval $(call gb_CppunitTest_add_libs,vcl_wmf_test,\
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index caff16e..5949156 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -594,17 +594,13 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 $(eval $(call gb_Library_use_externals,vcl,\
 	cairo \
 	freetype \
+	fontconfig \
 ))
 ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
 $(eval $(call gb_Library_add_libs,vcl,\
     -lpthread \
 ))
 endif
-ifneq ($(OS),EMSCRIPTEN)
-$(eval $(call gb_Library_use_externals,vcl,\
-	fontconfig \
-))
-endif
 else
  $(eval $(call gb_Library_add_exception_objects,vcl,\
 	vcl/opengl/DeviceInfo \

More information about the Libreoffice-commits mailing list