diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 14:05:21 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 18:01:27 +0000 |
commit | 8646ab97dc37c0606b19057686bf3d610f9c15ee (patch) | |
tree | 17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /external/redland | |
parent | 09e9274fc080b471393b806617eb03124db67590 (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/redland')
-rw-r--r-- | external/redland/ExternalPackage_raptor.mk | 2 | ||||
-rw-r--r-- | external/redland/ExternalPackage_rasqal.mk | 2 | ||||
-rw-r--r-- | external/redland/ExternalPackage_redland.mk | 2 | ||||
-rw-r--r-- | external/redland/ExternalProject_raptor.mk | 18 | ||||
-rw-r--r-- | external/redland/ExternalProject_rasqal.mk | 21 | ||||
-rw-r--r-- | external/redland/ExternalProject_redland.mk | 22 | ||||
-rw-r--r-- | external/redland/UnpackedTarball_raptor.mk | 1 | ||||
-rw-r--r-- | external/redland/UnpackedTarball_rasqal.mk | 1 | ||||
-rw-r--r-- | external/redland/UnpackedTarball_redland.mk | 1 | ||||
-rw-r--r-- | external/redland/raptor/raptor-mingw.patch.1 | 13 | ||||
-rw-r--r-- | external/redland/rasqal/rasqal-mingw.patch.1 | 13 | ||||
-rw-r--r-- | external/redland/redland/redland-mingw.patch.1 | 13 | ||||
-rw-r--r-- | external/redland/redland/redland-msvc.patch.1 | 12 |
13 files changed, 1 insertions, 120 deletions
diff --git a/external/redland/ExternalPackage_raptor.mk b/external/redland/ExternalPackage_raptor.mk index 4a81a165c0de..119e52f9e6ed 100644 --- a/external/redland/ExternalPackage_raptor.mk +++ b/external/redland/ExternalPackage_raptor.mk @@ -13,8 +13,6 @@ $(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor)) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-lo.$(RAPTOR_MAJOR).dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib)) -else ifeq ($(OS)-$(COM),WNT-GCC) -$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-$(RAPTOR_MAJOR).dll,src/.libs/libraptor2-$(RAPTOR_MAJOR).dll)) else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2.dll,src/.libs/libraptor2.dll)) else ifeq ($(DISABLE_DYNLOADING),) diff --git a/external/redland/ExternalPackage_rasqal.mk b/external/redland/ExternalPackage_rasqal.mk index ebe519a113c5..57fe97c38eae 100644 --- a/external/redland/ExternalPackage_rasqal.mk +++ b/external/redland/ExternalPackage_rasqal.mk @@ -13,8 +13,6 @@ $(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal)) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-lo.$(RASQAL_MAJOR).dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib)) -else ifeq ($(OS)-$(COM),WNT-GCC) -$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-$(RASQAL_MAJOR).dll,src/.libs/librasqal-$(RASQAL_MAJOR).dll)) else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal.dll,src/.libs/librasqal.dll)) else ifeq ($(DISABLE_DYNLOADING),) diff --git a/external/redland/ExternalPackage_redland.mk b/external/redland/ExternalPackage_redland.mk index d37ae8622f79..8c35d850e910 100644 --- a/external/redland/ExternalPackage_redland.mk +++ b/external/redland/ExternalPackage_redland.mk @@ -13,8 +13,6 @@ $(eval $(call gb_ExternalPackage_use_external_project,redland,redland)) ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-lo.$(REDLAND_MAJOR).dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib)) -else ifeq ($(OS)-$(COM),WNT-GCC) -$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll)) else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf.dll,src/.libs/librdf.dll)) else ifeq ($(DISABLE_DYNLOADING),) diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk index 51efb1a2212b..70e28edf99b8 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -15,23 +15,6 @@ $(eval $(call gb_ExternalProject_register_targets,raptor,\ build \ )) -ifeq ($(OS),WNT) -$(call gb_ExternalProject_get_state_target,raptor,build): - $(call gb_ExternalProject_run,build,\ - CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \ - OBJDUMP="$(HOST_PLATFORM)-objdump" \ - $(if $(and $(SYSTEM_LIBXML),$(filter GCC,$(COM))),PATH="$(MINGW_SYSROOT)/bin:$$PATH") \ - ./configure --disable-static --enable-shared --disable-gtk-doc \ - --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ - --with-www=xml \ - --without-xslt-config \ - --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \ - lt_cv_cc_dll_switch="-shared" \ - $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ - && $(MAKE) \ - ) -else $(call gb_ExternalProject_get_state_target,raptor,build): $(call gb_ExternalProject_run,build,\ $(if $(filter IOS,$(OS)),LIBS="-liconv") \ @@ -56,6 +39,5 @@ $(call gb_ExternalProject_get_state_target,raptor,build): $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ && $(MAKE) \ ) -endif # vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index 49c3f6555a3d..2d9393e14a34 100644 --- a/external/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk @@ -19,26 +19,6 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\ # note: this can intentionally only build against internal raptor (not system) -ifeq ($(OS),WNT) -$(call gb_ExternalProject_get_state_target,rasqal,build): - $(call gb_ExternalProject_run,build,\ - CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \ - OBJDUMP="$(HOST_PLATFORM)-objdump" \ - PKG_CONFIG="" \ - RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ - RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \ - ./configure --disable-static --enable-shared --disable-gtk-doc \ - --disable-pcre \ - --with-decimal=none \ - --with-uuid-library=internal \ - --with-digest-library=internal \ - --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - lt_cv_cc_dll_switch="-shared" \ - $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \ - && $(MAKE) \ - ) -else $(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_ExternalProject_run,build,\ CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ @@ -68,6 +48,5 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \ ) -endif # vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index 64746ff16077..e127755da0da 100644 --- a/external/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk @@ -20,27 +20,6 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\ # note: this can intentionally only build against internal raptor/rasqal -ifeq ($(OS),WNT) -$(call gb_ExternalProject_get_state_target,redland,build): - $(call gb_ExternalProject_run,build,\ - CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols" \ - OBJDUMP="$(HOST_PLATFORM)-objdump" \ - PKG_CONFIG="" \ - RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ - RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 $(LIBXML_LIBS)" \ - RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \ - RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \ - ./configure --disable-static --disable-gtk-doc \ - --disable-modular \ - --without-threads \ - --without-bdb --without-sqlite --without-mysql \ - --without-postgresql --without-threestore --without-virtuoso \ - --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - lt_cv_cc_dll_switch="-shared" \ - && $(MAKE) \ - ) -else $(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_run,build,\ CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ @@ -71,6 +50,5 @@ $(call gb_ExternalProject_get_state_target,redland,build): $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_redland)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \ ) -endif # vim: set noet sw=4 ts=4: diff --git a/external/redland/UnpackedTarball_raptor.mk b/external/redland/UnpackedTarball_raptor.mk index 762903018d43..7df3ee6db40f 100644 --- a/external/redland/UnpackedTarball_raptor.mk +++ b/external/redland/UnpackedTarball_raptor.mk @@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,raptor,0)) $(eval $(call gb_UnpackedTarball_add_patches,raptor,\ external/redland/raptor/raptor-freebsd.patch.1 \ external/redland/raptor/raptor-msvc.patch.1 \ - $(if $(filter WNTGCC,$(OS)$(COM)),external/redland/raptor/raptor-mingw.patch.1) \ $(if $(filter-out WNT,$(OS)),external/redland/raptor/raptor-bundled-soname.patch.1) \ $(if $(filter ANDROID,$(OS)),external/redland/raptor/raptor-android.patch.1) \ external/redland/raptor/ubsan.patch \ diff --git a/external/redland/UnpackedTarball_rasqal.mk b/external/redland/UnpackedTarball_rasqal.mk index 37e4fafee0a8..ed479a942d10 100644 --- a/external/redland/UnpackedTarball_rasqal.mk +++ b/external/redland/UnpackedTarball_rasqal.mk @@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,rasqal,\ external/redland/rasqal/rasqal-aix.patch.1 \ $(if $(filter-out WNT,$(OS)),external/redland/rasqal/rasqal-bundled-soname.patch.1) \ $(if $(filter ANDROID,$(OS)),external/redland/rasqal/rasqal-android.patch.1) \ - $(if $(filter WNTGCC,$(OS)$(COM)),external/redland/rasqal/rasqal-mingw.patch.1) \ $(if $(CROSS_COMPILING),external/redland/rasqal/rasqal-xcompile.patch.1) \ external/redland/rasqal/rpath.patch \ external/redland/rasqal/clang-cl.patch \ diff --git a/external/redland/UnpackedTarball_redland.mk b/external/redland/UnpackedTarball_redland.mk index e543b05fb05e..92c54aea147a 100644 --- a/external/redland/UnpackedTarball_redland.mk +++ b/external/redland/UnpackedTarball_redland.mk @@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,redland,\ external/redland/redland/redland-msvc.patch.1 \ $(if $(filter-out WNT,$(OS)),external/redland/redland/redland-bundled-soname.patch.1) \ $(if $(filter ANDROID,$(OS)),external/redland/redland/redland-android.patch.1) \ - $(if $(filter WNTGCC,$(OS)$(COM)),external/redland/redland/redland-mingw.patch.1) \ $(if $(CROSS_COMPILING),external/redland/redland/redland-xcompile.patch.1) \ external/redland/redland/redland-format.patch.0 \ external/redland/redland/rpath.patch \ diff --git a/external/redland/raptor/raptor-mingw.patch.1 b/external/redland/raptor/raptor-mingw.patch.1 deleted file mode 100644 index db4121829e5b..000000000000 --- a/external/redland/raptor/raptor-mingw.patch.1 +++ /dev/null @@ -1,13 +0,0 @@ -MinGW: libtool falls back to static lib unless -no-undefined given - ---- a/src/Makefile.in 2013-03-29 19:11:27.944919859 +0100 -+++ b/src/Makefile.in 2013-03-29 20:05:02.140892243 +0100 -@@ -507,7 +507,7 @@ - $(am__append_21) $(am__append_22) $(am__append_23) \ - $(am__append_24) $(am__append_25) $(am__append_26) - libraptor2_la_LIBADD = $(am__append_29) @LTLIBOBJS@ --libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \ -+libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -no-undefined \ - @RAPTOR_LDFLAGS@ $(MEM_LIBS) - - EXTRA_DIST = \ diff --git a/external/redland/rasqal/rasqal-mingw.patch.1 b/external/redland/rasqal/rasqal-mingw.patch.1 deleted file mode 100644 index 5d808b7330c0..000000000000 --- a/external/redland/rasqal/rasqal-mingw.patch.1 +++ /dev/null @@ -1,13 +0,0 @@ -MinGW: libtool falls back to static lib unless -no-undefined given - ---- a/src/Makefile.in 2013-03-29 21:44:58.115840724 +0100 -+++ b/src/Makefile.in 2013-03-29 21:46:43.024839823 +0100 -@@ -621,7 +621,7 @@ - $(am__append_2) $(am__append_3) $(am__append_4) \ - $(am__append_5) $(am__append_6) $(am__append_7) - nodist_librasqal_la_SOURCES = $(am__append_8) --librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -+librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -no-undefined - librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ \ - @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) \ - $(top_builddir)/libsv/libsv.la $(am__append_10) diff --git a/external/redland/redland/redland-mingw.patch.1 b/external/redland/redland/redland-mingw.patch.1 deleted file mode 100644 index 358633d247b6..000000000000 --- a/external/redland/redland/redland-mingw.patch.1 +++ /dev/null @@ -1,13 +0,0 @@ -MinGW: libtool falls back to static lib unless -no-undefined given - ---- redland/src/Makefile.in.old 2013-03-30 17:43:48.127008037 +0100 -+++ redland/src/Makefile.in 2013-03-30 17:47:15.753006253 +0100 -@@ -625,7 +625,7 @@ - rdf_parser_raptor.c - - EXTRA_DIST = redland.spec redland.spec.in mysql-v1.ttl mysql-v2.ttl --librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ \ -+librdf_la_LDFLAGS = -version-info @LIBRDF_LIBTOOL_VERSION@ -no-undefined \ - @LIBRDF_LDFLAGS@ @LIBRDF_EXTERNAL_LIBS@ - - pkgdata_DATA = $(am__append_13) diff --git a/external/redland/redland/redland-msvc.patch.1 b/external/redland/redland/redland-msvc.patch.1 index c307c7e17a37..c69366bc23f5 100644 --- a/external/redland/redland/redland-msvc.patch.1 +++ b/external/redland/redland/redland-msvc.patch.1 @@ -86,17 +86,7 @@ /* Define to 1 if you have the <openssl/crypto.h> header file. */ /* #undef HAVE_OPENSSL_CRYPTO_H */ -@@ -178,6 +181,9 @@ - - /* Define to 1 if you have the <pthread.h> header file. */ - /* #undef HAVE_PTHREAD_H */ -+#ifdef __MINGW32__ -+#undef HAVE_PTHREAD_H -+#endif - - /* Define to 1 if you have the <stdint.h> header file. */ - #define HAVE_STDINT_H 1 -@@ -261,7 +270,7 @@ +@@ -261,7 +267,7 @@ /*#undef STORAGE_POSTGRESQL*/ /* Building SQLite storage */ |