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/curl | |
| parent | Optimize Excel GetOrCreateRow: reduce loops (diff) | |
| download | core-8646ab97dc37c0606b19057686bf3d610f9c15ee.tar.gz core-8646ab97dc37c0606b19057686bf3d610f9c15ee.zip | |
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/curl')
| -rw-r--r-- | external/curl/ExternalPackage_curl.mk | 4 | ||||
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 15 | ||||
| -rw-r--r-- | external/curl/UnpackedTarball_curl.mk | 1 | ||||
| -rw-r--r-- | external/curl/curl-7.26.0_mingw.patch | 24 |
4 files changed, 1 insertions, 43 deletions
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk index 2de52db1b741..18907f4e5a54 100644 --- a/external/curl/ExternalPackage_curl.mk +++ b/external/curl/ExternalPackage_curl.mk @@ -13,9 +13,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,curl,curl)) ifneq ($(DISABLE_DYNLOADING),TRUE) -ifeq ($(OS)$(COM),WNTGCC) -$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll)) -else ifeq ($(COM),MSC) +ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll,lib/$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll)/libcurl$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll)) else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dylib,lib/.libs/libcurl.4.dylib)) diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 48d0b6a8e6bb..f57efc07fd73 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -60,21 +60,6 @@ $(call gb_ExternalProject_get_state_target,curl,build): && $(MAKE) \ ) -else ifeq ($(OS)$(COM),WNTGCC) - -$(call gb_ExternalProject_get_state_target,curl,build): - $(call gb_ExternalProject_run,build,\ - ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \ - --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \ - $(if $(ENABLE_DEBUG),--enable-debug) \ - CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - LIBS="-lws2_32 -lwinmm $(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \ - LDFLAGS="$(patsubst ;, -L,$(ILIB))" \ - CPPFLAGS="$(INCLUDE)" OBJDUMP="objdump" \ - && cd lib \ - && $(MAKE) \ - ) - else ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,curl,build): diff --git a/external/curl/UnpackedTarball_curl.mk b/external/curl/UnpackedTarball_curl.mk index 536474d4a30b..3e88d5f771f1 100644 --- a/external/curl/UnpackedTarball_curl.mk +++ b/external/curl/UnpackedTarball_curl.mk @@ -20,7 +20,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,curl,\ $(eval $(call gb_UnpackedTarball_add_patches,curl,\ external/curl/curl-msvc.patch.1 \ external/curl/curl-msvc-schannel.patch.1 \ - external/curl/curl-7.26.0_mingw.patch \ external/curl/curl-7.26.0_win-proxy.patch \ external/curl/curl-xp.patch.1 \ )) diff --git a/external/curl/curl-7.26.0_mingw.patch b/external/curl/curl-7.26.0_mingw.patch deleted file mode 100644 index be9a20cac358..000000000000 --- a/external/curl/curl-7.26.0_mingw.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/lib/curl_setup.h 2009-10-29 05:21:58.000000000 +0900 -+++ b/lib/curl_setup.h 2010-03-02 06:03:10.009500000 +0900 -@@ -40,6 +40,21 @@ - - #include "curl_config.h" - -+#ifdef __MINGW32__ -+#undef HAVE_DLFCN_H -+#define HAVE_GETHOSTBYADDR 1 -+#define HAVE_GETHOSTBYNAME 1 -+#undef HAVE_LIBZ -+#undef HAVE_NETDB_H -+#undef HAVE_POLL_H -+#undef HAVE_SYS_IOCTL_H -+#undef HAVE_SYS_POLL_H -+#undef HAVE_SYS_UIO_H -+#undef HAVE_TERMIOS_H -+#undef HAVE_TERMIO_H -+#undef HAVE_ZLIB_H -+#endif -+ - #else /* HAVE_CONFIG_H */ - - #ifdef _WIN32_WCE |