From 8646ab97dc37c0606b19057686bf3d610f9c15ee Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 10 Feb 2017 14:05:21 +0100 Subject: Remove MinGW support In OOo times, there'd originally been efforts to allow building on Windows with MinGW. Later, in LO times, this has been shifted to an attempt of cross- compiling for Windows on Linux. That attempt can be considered abandoned, and the relevant code rotting. Due to this heritage, there are now three kinds of MinGW-specific code in LO: * Code from the original OOo native Windows effort that is no longer relevant for the LO cross-compilation effort, but has never been removed properly. * Code from the original OOo native Windows effort that is re-purposed for the LO cross-compilation effort. * Code that has been added specifially for the LO cross-compilation effort. All three kinds of code are removed. (An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing --with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.) Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568 Reviewed-on: https://gerrit.libreoffice.org/34127 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- external/liblangtag/ExternalProject_langtag.mk | 5 +- external/liblangtag/UnpackedTarball_langtag.mk | 8 --- external/liblangtag/liblangtag-0.5.1-mingw.patch | 64 ------------------------ 3 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 external/liblangtag/liblangtag-0.5.1-mingw.patch (limited to 'external/liblangtag') diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index eacf41db28a4..d20d7dd7fd85 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -30,12 +30,11 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) "ac_cv_va_copy=no") \ LIBXML2_CFLAGS="$(LIBXML_CFLAGS)" \ - LIBXML2_LIBS="$(if $(filter WNTMSC,$(OS)$(COM)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \ + LIBXML2_LIBS="$(if $(filter WNT,$(OS)),-L$(call gb_UnpackedTarball_get_dir,xml2)/win32/bin.msvc -llibxml2,$(LIBXML_LIBS))" \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB) \ $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN) \ - $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ - && $(if $(filter WNTMSC,$(OS)$(COM)),\ + && $(if $(filter WNT,$(OS)),\ REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \ REAL_CC_FLAGS="$(filter -%,$(CC))") \ $(if $(verbose),V=1) \ diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk index 47505f85859c..d8fccf261512 100644 --- a/external/liblangtag/UnpackedTarball_langtag.mk +++ b/external/liblangtag/UnpackedTarball_langtag.mk @@ -23,14 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,langtag,\ endif endif -ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(eval $(call gb_UnpackedTarball_add_patches,langtag,\ - external/liblangtag/liblangtag-0.5.1-mingw.patch \ -)) -endif -endif - $(eval $(call gb_UnpackedTarball_add_patches,langtag, \ $(if $(SYSTEM_LIBXML),,external/liblangtag/langtag-libtool-rpath.patch.0) \ external/liblangtag/clang-cl.patch.0 \ diff --git a/external/liblangtag/liblangtag-0.5.1-mingw.patch b/external/liblangtag/liblangtag-0.5.1-mingw.patch deleted file mode 100644 index 54790e99a0c7..000000000000 --- a/external/liblangtag/liblangtag-0.5.1-mingw.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2013-06-14 15:06:13.629182430 +0100 -+++ misc/liblangtag-0.4.0/liblangtag/lt-ext-module.c 2013-06-14 15:06:43.537534204 +0100 -@@ -608,8 +608,8 @@ - size_t len; - - while (1) { -- if (readdir_r(dir, &dent, &dresult) || dresult == NULL) -- break; -+/* if (readdir_r(dir, &dent, &dresult) || dresult == NULL) -+ break;*/ abort(); /* we do not use liblangtag-gobject anyway */ - - len = strlen(dent.d_name); - if (len > suffix_len && ---- misc/liblangtag-0.4.0/liblangtag/Makefile.am 2013-06-14 15:06:13.636182512 +0100 -+++ misc/liblangtag-0.4.0/liblangtag/Makefile.am 2013-06-14 15:08:53.556063464 +0100 -@@ -211,6 +211,7 @@ - liblangtag_la_LDFLAGS = \ - $(LDFLAGS) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -+ -no-undefined \ - $(NULL) - - -include $(top_srcdir)/git.mk ---- misc/liblangtag-0.4.0/liblangtag/Makefile.in 2013-06-14 15:06:13.636182512 +0100 -+++ misc/liblangtag-0.4.0/liblangtag/Makefile.in 2013-06-14 15:09:07.204223994 +0100 -@@ -576,6 +576,7 @@ - liblangtag_la_LDFLAGS = \ - $(LDFLAGS) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -+ -no-undefined \ - $(NULL) - - all: $(BUILT_SOURCES) ---- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.am 2013-06-14 15:06:13.648182653 +0100 -+++ misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.am 2013-06-14 15:09:27.122458271 +0100 -@@ -149,6 +149,7 @@ - liblangtag_gobject_la_LDFLAGS = \ - $(LDFLAGS) \ - -version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \ -+ -no-undefined \ - $(NULL) - # - if HAVE_INTROSPECTION ---- misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.in 2013-06-14 15:06:13.648182653 +0100 -+++ misc/liblangtag-0.4.0/liblangtag-gobject/Makefile.in 2013-06-14 15:09:33.099528574 +0100 -@@ -476,6 +476,7 @@ - liblangtag_gobject_la_LDFLAGS = \ - $(LDFLAGS) \ - -version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE) \ -+ -no-undefined \ - $(NULL) - - # ---- misc/liblangtag-0.4.0/Makefile.am 2013-06-14 15:06:13.652182700 +0100 -+++ misc/liblangtag-0.4.0/Makefile.am 2013-06-14 15:06:43.539534228 +0100 -@@ -6,7 +6,7 @@ - SUBDIRS += liblangtag-gobject - endif - #SUBDIRS += docs tests --SUBDIRS += tests -+#SUBDIRS += tests - - ACLOCAL_AMFLAGS = -I m4macros - -- cgit