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 | |
| 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')
65 files changed, 36 insertions, 1574 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index 52950c2686ff..d83560d35ed5 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -9,10 +9,6 @@ $(eval $(call gb_Module_Module,external)) -ifeq ($(OS)$(COM),WNTGCC) -$(eval $(call gb_Module_add_moduledir,external,mingw-externals)) -endif - ifeq ($(COM),MSC) $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif diff --git a/external/breakpad/Module_breakpad.mk b/external/breakpad/Module_breakpad.mk index be910538fd58..aeb3c42a9d6d 100644 --- a/external/breakpad/Module_breakpad.mk +++ b/external/breakpad/Module_breakpad.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,breakpad,\ UnpackedTarball_breakpad \ )) -ifneq ($(OS)$(COM),WNTMSC) +ifneq ($(OS),WNT) $(eval $(call gb_Module_add_targets,breakpad,\ ExternalProject_breakpad \ )) diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index 55434fce2a87..4938694151de 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -26,7 +26,7 @@ $(eval $(call gb_ExternalProject_register_targets,cairo,\ build \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,cairo,build) : $(call gb_ExternalProject_run,build,\ diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index 33a4b8d150e5..6dd2d6bed867 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -13,7 +13,7 @@ $(eval $(call gb_ExternalProject_register_targets,pixman,\ build \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,pixman,build) : $(call gb_ExternalProject_run,build,\ diff --git a/external/cairo/UnpackedTarball_pixman.mk b/external/cairo/UnpackedTarball_pixman.mk index d5a8907cd95e..777a47cc30fd 100644 --- a/external/cairo/UnpackedTarball_pixman.mk +++ b/external/cairo/UnpackedTarball_pixman.mk @@ -15,7 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,pixman,\ external/cairo/pixman/pixman-0.24.4.patch \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_file,pixman,pixman,external/cairo/pixman/Makefile.win32.common)) endif diff --git a/external/clucene/UnpackedTarball_clucene.mk b/external/clucene/UnpackedTarball_clucene.mk index fa4689d4b315..a878947b0871 100644 --- a/external/clucene/UnpackedTarball_clucene.mk +++ b/external/clucene/UnpackedTarball_clucene.mk @@ -50,15 +50,7 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,external/clucene/configs/_clucene-config-MSVC.h)) -ifeq ($(COM),MSC) $(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MSVC.h)) -else -ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE) -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MINGW-atomic.h)) -else -$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-MINGW.h)) -endif -endif else # ! $(OS),WNT ifeq ($(HAVE_GCC_BUILTIN_ATOMIC),TRUE) $(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,external/clucene/configs/clucene-config-GCC-atomic.h)) diff --git a/external/clucene/configs/clucene-config-MINGW-atomic.h b/external/clucene/configs/clucene-config-MINGW-atomic.h deleted file mode 100644 index 4b77b69ff8c5..000000000000 --- a/external/clucene/configs/clucene-config-MINGW-atomic.h +++ /dev/null @@ -1,150 +0,0 @@ -#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H -#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 - -/* src/shared/CLucene/clucene-config.h. -* Normally generated automatically at end of cmake, -* but here in LibreOffice this actually is a copy of -* clucene/configs/clucene-config-MINGW-atomic.h. -*/ - -/* CMake will look for these headers: */ -#define _CL_HAVE_STRING_H 1 -#define _CL_HAVE_MEMORY_H 1 -/* #undef _CL_HAVE_UNISTD_H */ -#define _CL_HAVE_IO_H 1 -#define _CL_HAVE_DIRECT_H 1 -/* #undef _CL_HAVE_DIRENT_H */ -/* #undef _CL_HAVE_SYS_DIR_H */ -/* #undef _CL_HAVE_SYS_NDIR_H */ -#define _CL_HAVE_ERRNO_H 1 -#define _CL_HAVE_WCHAR_H 1 -#define _CL_HAVE_WCTYPE_H -#define _CL_HAVE_CTYPE_H 1 -#define _CL_HAVE_WINDOWS_H 1 -/* #undef _CL_HAVE_WINDEF_H */ -#define _CL_HAVE_SYS_TYPES_H 1 -/* #undef _CL_HAVE_DLFCN_H */ -/* #undef _CL_HAVE_EXT_HASH_MAP */ -/* #undef _CL_HAVE_EXT_HASH_SET */ -/* #undef _CL_HAVE_TR1_UNORDERED_MAP */ -/* #undef _CL_HAVE_TR1_UNORDERED_SET */ -/* #undef _CL_HAVE_HASH_MAP */ -/* #undef _CL_HAVE_HASH_SET */ -/* #undef _CL_HAVE_NDIR_H */ -#define _CL_HAVE_SYS_STAT_H 1 -#define _CL_HAVE_SYS_TIMEB_H 1 -/* #undef _CL_HAVE_SYS_TIME_H */ -#define _CL_HAVE_TCHAR_H 1 -/* #undef _CL_HAVE_SYS_MMAN_H */ -#define _CL_HAVE_WINERROR_H 1 -/* #undef _CL_HAVE_STDINT_H */ - -// our needed types -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef signed long long int64_t; -typedef unsigned long long uint64_t; - -/* undef float_t*/ -typedef unsigned long _cl_dword_t; -/* undef size_t size_t */ - -/* tchar & _T definitions... */ -/* undef TCHAR TCHAR */ -/* #undef _T */ - -/* CMake will determine these specifics. Things like bugs, etc */ - -/* if we can't support the map/set hashing */ -/* #undef LUCENE_DISABLE_HASHING */ - -/* Define if you have POSIX threads libraries and header files. */ -/* #undef _CL_HAVE_PTHREAD */ - -/* Define if you have Win32 threads libraries and header files. */ -#define _CL_HAVE_WIN32_THREADS 1 - -/* Define if we have gcc atomic functions */ -#define _CL_HAVE_GCC_ATOMIC_FUNCTIONS 1 - -/* Define what eval method is required for float_t to be defined (for GCC). */ -/* #undef _FLT_EVAL_METHOD */ - -/* If we use hashmaps, which namespace do we use: */ -#define CL_NS_HASHING(func) -/* If we use hashmaps, which classes do we use: */ -#define _CL_HASH_MAP -#define _CL_HASH_SET - -/* define if the compiler implements namespaces */ -#define _CL_HAVE_NAMESPACES - -/* Defined if the snprintf overflow test fails */ -/* #undef _CL_HAVE_SNPRINTF_BUG */ - -/* Defined if the swprintf test fails */ -/* #undef _CL_HAVE_SNWPRINTF_BUG */ - -/* How to define a static const in a class */ -#define LUCENE_STATIC_CONSTANT(type, assignment) static const type assignment - -/* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ -//todo: not checked -/* #undef _CL_PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ -//todo: not being checked for... -/* #undef _CL_STAT_MACROS_BROKEN */ - -/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -//not actually used for anything... -/* #undef _CL_TIME_WITH_SYS_TIME */ - -/* Define that we will be using -fvisibility=hidden, and - * make public classes visible using __attribute__ ((visibility("default"))) - */ -/* #undef _CL_HAVE_GCCVISIBILITYPATCH */ - - -/* Versions, etc */ - -/* Name of package */ -#define _CL_PACKAGE "clucene-core" - -/* Version number of package */ -#define _CL_VERSION "2.3.3.4" - -/* So-Version number of package */ -#define _CL_SOVERSION "1" - -/* A comparable version number */ -#define _CL_INT_VERSION 2030304 - -/* Configured options (from command line) */ - -/* Forces into Ascii mode */ -/* #undef _ASCII */ - -/* Conditional Debugging */ -/* #undef _CL__CND_DEBUG */ - -/* debuging option */ -/* #undef _DEBUG */ - -/* Disable multithreading */ -/* #undef _CL_DISABLE_MULTITHREADING */ - - -#ifdef __BORLANDC__ //borland compiler - //todo: bcc incorrectly detects this... fix this in cmake - #undef LUCENE_STATIC_CONSTANT - #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment } -#endif - - -#endif diff --git a/external/clucene/configs/clucene-config-MINGW.h b/external/clucene/configs/clucene-config-MINGW.h deleted file mode 100644 index 009505edcf33..000000000000 --- a/external/clucene/configs/clucene-config-MINGW.h +++ /dev/null @@ -1,150 +0,0 @@ -#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H -#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 - -/* src/shared/CLucene/clucene-config.h. -* Normally generated automatically at end of cmake, -* but here in LibreOffice this actually is a copy of -* clucene/configs/clucene-config-MINGW.h. -*/ - -/* CMake will look for these headers: */ -#define _CL_HAVE_STRING_H 1 -#define _CL_HAVE_MEMORY_H 1 -/* #undef _CL_HAVE_UNISTD_H */ -#define _CL_HAVE_IO_H 1 -#define _CL_HAVE_DIRECT_H 1 -/* #undef _CL_HAVE_DIRENT_H */ -/* #undef _CL_HAVE_SYS_DIR_H */ -/* #undef _CL_HAVE_SYS_NDIR_H */ -#define _CL_HAVE_ERRNO_H 1 -#define _CL_HAVE_WCHAR_H 1 -#define _CL_HAVE_WCTYPE_H -#define _CL_HAVE_CTYPE_H 1 -#define _CL_HAVE_WINDOWS_H 1 -/* #undef _CL_HAVE_WINDEF_H */ -#define _CL_HAVE_SYS_TYPES_H 1 -/* #undef _CL_HAVE_DLFCN_H */ -/* #undef _CL_HAVE_EXT_HASH_MAP */ -/* #undef _CL_HAVE_EXT_HASH_SET */ -/* #undef _CL_HAVE_TR1_UNORDERED_MAP */ -/* #undef _CL_HAVE_TR1_UNORDERED_SET */ -/* #undef _CL_HAVE_HASH_MAP */ -/* #undef _CL_HAVE_HASH_SET */ -/* #undef _CL_HAVE_NDIR_H */ -#define _CL_HAVE_SYS_STAT_H 1 -#define _CL_HAVE_SYS_TIMEB_H 1 -/* #undef _CL_HAVE_SYS_TIME_H */ -#define _CL_HAVE_TCHAR_H 1 -/* #undef _CL_HAVE_SYS_MMAN_H */ -#define _CL_HAVE_WINERROR_H 1 -/* #undef _CL_HAVE_STDINT_H */ - -// our needed types -typedef signed char int8_t; -typedef unsigned char uint8_t; -typedef signed short int16_t; -typedef unsigned short uint16_t; -typedef signed int int32_t; -typedef unsigned int uint32_t; -typedef signed long long int64_t; -typedef unsigned long long uint64_t; - -/* undef float_t*/ -typedef unsigned long _cl_dword_t; -/* undef size_t size_t */ - -/* tchar & _T definitions... */ -/* undef TCHAR TCHAR */ -/* #undef _T */ - -/* CMake will determine these specifics. Things like bugs, etc */ - -/* if we can't support the map/set hashing */ -/* #undef LUCENE_DISABLE_HASHING */ - -/* Define if you have POSIX threads libraries and header files. */ -/* #undef _CL_HAVE_PTHREAD */ - -/* Define if you have Win32 threads libraries and header files. */ -#define _CL_HAVE_WIN32_THREADS 1 - -/* Define if we have gcc atomic functions */ -/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */ - -/* Define what eval method is required for float_t to be defined (for GCC). */ -/* #undef _FLT_EVAL_METHOD */ - -/* If we use hashmaps, which namespace do we use: */ -#define CL_NS_HASHING(func) -/* If we use hashmaps, which classes do we use: */ -#define _CL_HASH_MAP -#define _CL_HASH_SET - -/* define if the compiler implements namespaces */ -#define _CL_HAVE_NAMESPACES - -/* Defined if the snprintf overflow test fails */ -/* #undef _CL_HAVE_SNPRINTF_BUG */ - -/* Defined if the swprintf test fails */ -/* #undef _CL_HAVE_SNWPRINTF_BUG */ - -/* How to define a static const in a class */ -#define LUCENE_STATIC_CONSTANT(type, assignment) static const type assignment - -/* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ -//todo: not checked -/* #undef _CL_PTHREAD_CREATE_JOINABLE */ - -/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ -//todo: not being checked for... -/* #undef _CL_STAT_MACROS_BROKEN */ - -/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ -//not actually used for anything... -/* #undef _CL_TIME_WITH_SYS_TIME */ - -/* Define that we will be using -fvisibility=hidden, and - * make public classes visible using __attribute__ ((visibility("default"))) - */ -/* #undef _CL_HAVE_GCCVISIBILITYPATCH */ - - -/* Versions, etc */ - -/* Name of package */ -#define _CL_PACKAGE "clucene-core" - -/* Version number of package */ -#define _CL_VERSION "2.3.3.4" - -/* So-Version number of package */ -#define _CL_SOVERSION "1" - -/* A comparable version number */ -#define _CL_INT_VERSION 2030304 - -/* Configured options (from command line) */ - -/* Forces into Ascii mode */ -/* #undef _ASCII */ - -/* Conditional Debugging */ -/* #undef _CL__CND_DEBUG */ - -/* debuging option */ -/* #undef _DEBUG */ - -/* Disable multithreading */ -/* #undef _CL_DISABLE_MULTITHREADING */ - - -#ifdef __BORLANDC__ //borland compiler - //todo: bcc incorrectly detects this... fix this in cmake - #undef LUCENE_STATIC_CONSTANT - #define LUCENE_STATIC_CONSTANT(type, assignment) enum { assignment } -#endif - - -#endif diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 730d17c050fb..a11cc277cefa 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -13,7 +13,7 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\ build \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_ExternalProject_run,build,\ PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ @@ -34,10 +34,6 @@ cppunit_CXXFLAGS+=-D_GLIBCXX_DEBUG endif endif -ifeq ($(OS)-$(COM),WNT-GCC) -cppunit_CXXFLAGS+=-mthreads -endif - ifneq (,$(debug)) cppunit_CXXFLAGS+=-g endif 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 diff --git a/external/expat/Module_expat.mk b/external/expat/Module_expat.mk index ab39cdaf8dc5..baac0b595e20 100644 --- a/external/expat/Module_expat.mk +++ b/external/expat/Module_expat.mk @@ -14,14 +14,7 @@ $(eval $(call gb_Module_add_targets,expat,\ StaticLibrary_expat \ )) -# Actually it wasn't that clear if we should -# run configure step on mingw or not: -# CONFIGURATION_ACTION wasn't set, but -# CROSS_COMPILE case was handled in original makefile - -# tested it on mingw and it doesn't hurt ;-) -#ifneq ($(OS),WNT) -ifneq ($(OS)$(COM),WNTMSC) +ifneq ($(OS),WNT) $(eval $(call gb_Module_add_targets,expat,\ ExternalProject_expat \ )) diff --git a/external/expat/StaticLibrary_expat.mk b/external/expat/StaticLibrary_expat.mk index 4d6957f9ef52..bdcc767e2905 100644 --- a/external/expat/StaticLibrary_expat.mk +++ b/external/expat/StaticLibrary_expat.mk @@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat)) $(eval $(call gb_StaticLibrary_use_unpacked,expat,expat)) # no configure step on windows, no dependency -ifneq ($(OS)$(COM),WNTMSC) +ifneq ($(OS),WNT) $(eval $(call gb_StaticLibrary_use_external_project,expat,expat,full)) endif diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 6505eda1064f..87df3567e932 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,firebird,firebird)) $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) -ifeq ($(OS)-$(COM),WNT-MSC) +ifeq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbclient.dll,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/bin/ifbclient.dll)) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/Engine12.dll,gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/Engine12.dll)) else ifeq ($(OS),MACOSX) diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index e30048d4e69b..3cd7a42a0772 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -25,7 +25,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1 \ )) -ifeq ($(OS)-$(COM),WNT-MSC) +ifeq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird-cygwin-msvc.patch \ )) diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 1980637cd6de..46c7972d0601 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -13,7 +13,7 @@ $(eval $(call gb_ExternalProject_register_targets,freetype,\ build \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,freetype,build) : $(call gb_ExternalProject_run,build,\ cd ../builds/win32/vc2010/ && \ diff --git a/external/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk index 274778a088a9..4c3b74d5965c 100644 --- a/external/hunspell/ExternalProject_hunspell.mk +++ b/external/hunspell/ExternalProject_hunspell.mk @@ -33,7 +33,6 @@ $(call gb_ExternalProject_get_state_target,hunspell,build): $(SHELL) ./configure --disable-shared --disable-nls --with-pic \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM))\ $(if $(filter AIX,$(OS)),CFLAGS="-D_LINUX_SOURCE_COMPAT") \ - $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--enable-runtime-pseudo-reloc-v2") \ CXXFLAGS="$(hunspell_CXXFLAGS)" \ && cd src/hunspell && $(MAKE) \ ) diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 4ff3b9fa5937..646b10b40155 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -18,7 +18,6 @@ icu_CPPFLAGS:="-DHAVE_GCC_ATOMICS=$(if $(filter TRUE,$(GCC_HAVE_BUILTIN_ATOMIC)) ifeq ($(OS),WNT) # Note: runConfigureICU ignores everything following the platform name! -ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,icu,build) : $(call gb_ExternalProject_run,build,\ export LIB="$(ILIB)" \ @@ -29,23 +28,6 @@ $(call gb_ExternalProject_get_state_target,icu,build) : Cygwin/MSVC \ && $(MAKE) \ ,source) -else -$(call gb_ExternalProject_get_state_target,icu,build) : - $(call gb_ExternalProject_run,build,\ - CPPFLAGS=$(icu_CPPFLAGS) CFLAGS="-O -D_MT" CXXFLAGS="-O -D_MT" \ - LIBS="$(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \ - LDFLAGS="-L$(COMPATH)/lib -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 \ - $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - ./configure \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \ - --disable-layout --disable-static --enable-shared --disable-samples \ - && $(MAKE) \ - && for lib in icudata icuin icuuc; do \ - touch $$lib; \ - done \ - ,source) -endif else # $(OS) diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 86791ddfbf17..e307a30f4a31 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -31,7 +31,6 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): $(if $(filter INTEL ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \ CPPFLAGS=" $(SOLARINC)" \ CFLAGS='$(CFLAGS) $(if $(debug),$(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS),$(gb_COMPILEROPTFLAGS))' \ - $(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \ $(if $(DISABLE_DYNLOADING), \ --enable-static --disable-shared \ , \ diff --git a/external/libcmis/UnpackedTarball_cmis.mk b/external/libcmis/UnpackedTarball_cmis.mk index 2ba454f87a89..38f592a1bf34 100644 --- a/external/libcmis/UnpackedTarball_cmis.mk +++ b/external/libcmis/UnpackedTarball_cmis.mk @@ -21,7 +21,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \ external/libcmis/libcmis-fix-error-handling.patch \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch)) endif 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 - diff --git a/external/libxml2/ExternalProject_xml2.mk b/external/libxml2/ExternalProject_xml2.mk index aa9d612ac45e..f60d960d6790 100644 --- a/external/libxml2/ExternalProject_xml2.mk +++ b/external/libxml2/ExternalProject_xml2.mk @@ -14,20 +14,6 @@ $(eval $(call gb_ExternalProject_register_targets,xml2,\ )) ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(call gb_ExternalProject_get_state_target,xml2,build): - $(call gb_ExternalProject_run,build,\ - ./configure --disable-ipv6 --without-python --without-zlib \ - --without-lzma \ - --disable-static --without-debug lt_cv_cc_dll_switch="-shared" \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - LIBS="-lws2_32 $(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \ - LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \ - OBJDUMP=objdump \ - && $(MAKE) \ - ) -else # COM=MSC $(call gb_ExternalProject_use_external_project,xml2,icu) $(call gb_ExternalProject_get_state_target,xml2,build): @@ -38,7 +24,6 @@ $(call gb_ExternalProject_get_state_target,xml2,build): && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) -endif else # OS!=WNT $(call gb_ExternalProject_get_state_target,xml2,build): $(call gb_ExternalProject_run,build,\ diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk b/external/libxmlsec/ExternalProject_xmlsec.mk index 31708c4577ba..66abd02ac3a5 100644 --- a/external/libxmlsec/ExternalProject_xmlsec.mk +++ b/external/libxmlsec/ExternalProject_xmlsec.mk @@ -21,21 +21,6 @@ $(eval $(call gb_ExternalProject_register_targets,xmlsec,\ ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(call gb_ExternalProject_get_state_target,xmlsec,build) : - $(call gb_ExternalProject_run,build,\ - autoreconf \ - && ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - --without-libxslt --without-openssl --without-gnutls --disable-crypto-dl \ - $(if $(SYSTEM_NSS),,--disable-pkgconfig) \ - CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - LDFLAGS="-Wl$(COMMA)--no-undefined $(ILIB:;= -L)" \ - LIBS="$(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED__LIBSTDCPP))" \ - lt_cv_deplibs_check_method=pass_all \ - && $(MAKE) \ - ) - -else $(call gb_ExternalProject_get_state_target,xmlsec,build) : $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js crypto=mscrypto xslt=no iconv=no static=no \ @@ -44,7 +29,6 @@ $(call gb_ExternalProject_get_state_target,xmlsec,build) : && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) -endif else diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 b/external/libxmlsec/xmlsec1-configure.patch.1 index 2b496d7ee9fd..e114012ab602 100644 --- a/external/libxmlsec/xmlsec1-configure.patch.1 +++ b/external/libxmlsec/xmlsec1-configure.patch.1 @@ -88,7 +88,7 @@ index b8770ad..721e4ca 100644 -NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" + +case $host_os in -+cygwin* | mingw* | pw32*) ++cygwin* | pw32*) + NSS_LIBS_LIST="-lnss3 -lsmime3" + NSPR_LIBS_LIST="-lnspr4" + ;; diff --git a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 b/external/libxmlsec/xmlsec1-customkeymanage.patch.1 index 226d6c0394a1..2a5f15fecf4f 100644 --- a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 +++ b/external/libxmlsec/xmlsec1-customkeymanage.patch.1 @@ -3165,7 +3165,7 @@ new file mode 100644 index 0000000..e27d1e4 --- /dev/null +++ b/src/nss/tokens.c -@@ -0,0 +1,548 @@ +@@ -0,0 +1,544 @@ +/** + * XMLSec library + * @@ -3517,11 +3517,7 @@ index 0000000..e27d1e4 +/** + * Key Slot List + */ -+#ifdef __MINGW32__ // for runtime-pseudo-reloc -+static struct _xmlSecPtrListKlass xmlSecNssKeySlotPtrListKlass = { -+#else +static xmlSecPtrListKlass xmlSecNssKeySlotPtrListKlass = { -+#endif + BAD_CAST "mechanism-list", + (xmlSecPtrDuplicateItemMethod)xmlSecNssKeySlotDuplicate, + (xmlSecPtrDestroyItemMethod)xmlSecNssKeySlotDestroy, diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk index af19e840b56c..02c239b069ee 100644 --- a/external/libxslt/ExternalProject_xslt.mk +++ b/external/libxslt/ExternalProject_xslt.mk @@ -15,19 +15,6 @@ $(eval $(call gb_ExternalProject_register_targets,xslt,\ build \ )) ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(call gb_ExternalProject_get_state_target,xslt,build): - $(call gb_ExternalProject_run,build,\ - ./configure --without-crypto --without-python --disable-static \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - CC="$(CC) -mthreads $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - $(if $(MINGW_SHARED_GXXLIB),LIBS="$(MINGW_SHARED_LIBSTDCPP)") \ - LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2" \ - OBJDUMP=objdump \ - && chmod 777 xslt-config \ - && $(MAKE) \ - ) -else # COM=MSC $(call gb_ExternalProject_get_state_target,xslt,build): $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js \ @@ -37,7 +24,6 @@ $(call gb_ExternalProject_get_state_target,xslt,build): && unset MAKEFLAGS \ && LIB="$(ILIB)" nmake \ ,win32) -endif else # OS!=WNT $(call gb_ExternalProject_get_state_target,xslt,build): $(call gb_ExternalProject_run,build,\ diff --git a/external/lpsolve/ExternalProject_lpsolve.mk b/external/lpsolve/ExternalProject_lpsolve.mk index 120ded64942f..cbe35931f473 100644 --- a/external/lpsolve/ExternalProject_lpsolve.mk +++ b/external/lpsolve/ExternalProject_lpsolve.mk @@ -14,21 +14,11 @@ $(eval $(call gb_ExternalProject_register_targets,lpsolve,\ )) ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(call gb_ExternalProject_get_state_target,lpsolve,build): - $(call gb_ExternalProject_run,build,\ - $(if $(filter WNT,$(OS_FOR_BUILD)), \ - $(if $(MINGW_SHARED_GCCLIB) lpsolve_LDFLAGS="-shared-libgcc") \ - $(if $(MINGW_SHARED_GXXLIB) lpsolve_LIBS="$(MINGW_SHARED_LIBSTDCPP)") \ - cmd /c cgcc.bat, sh ccc) \ - ,lpsolve55) -else # $(COM)!=GCC $(call gb_ExternalProject_get_state_target,lpsolve,build): $(call gb_ExternalProject_run,build,\ LIB="$(ILIB)" RUNTIME_FLAG="$(if $(MSVC_USE_DEBUG_RUNTIME),/MDd,/MD)" \ cmd /c cvc6.bat \ ,lpsolve55) -endif # $(COM) else # $(OS)!=WNT $(call gb_ExternalProject_get_state_target,lpsolve,build): $(call gb_ExternalProject_run,build,\ diff --git a/external/mingw-externals/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk deleted file mode 100644 index 1fb5fa872eb2..000000000000 --- a/external/mingw-externals/CustomTarget_jawt.mk +++ /dev/null @@ -1,33 +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/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,external/jawt)) - -$(eval $(call gb_CustomTarget_register_targets,external/jawt,\ - jawt.def \ - libjawt.dll.a \ -)) - -ifeq ($(OS)-$(CPUNAME),WNT-X86_64) -$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo EXPORTS > $@ - echo "JAWT_GetAWT" >> $@ -else -$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo EXPORTS > $@ - echo "JAWT_GetAWT@8" >> $@ -endif - -$(call gb_CustomTarget_get_workdir,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1) - $(DLLTOOL) --input-def=$< --output-lib=$@ --dllname=jawt.dll - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Module_mingw-externals.mk b/external/mingw-externals/Module_mingw-externals.mk deleted file mode 100644 index e63016239c7c..000000000000 --- a/external/mingw-externals/Module_mingw-externals.mk +++ /dev/null @@ -1,20 +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/. -# - -$(eval $(call gb_Module_Module,mingw-externals)) - -ifeq ($(OS)$(COM),WNTGCC) -$(eval $(call gb_Module_add_targets,mingw-externals,\ - CustomTarget_jawt \ - Package_mingw_dlls \ - Package_mingw_gccdlls \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/external/mingw-externals/Package_mingw_dlls.mk b/external/mingw-externals/Package_mingw_dlls.mk deleted file mode 100644 index 65a042d4d0b2..000000000000 --- a/external/mingw-externals/Package_mingw_dlls.mk +++ /dev/null @@ -1,16 +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/. -# - -$(eval $(call gb_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin)) - -$(eval $(call gb_Package_add_files,mingw_dlls,bin,\ - $(sort $(MINGW_DLLS)) \ -)) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk deleted file mode 100644 index b5d37c570238..000000000000 --- a/external/mingw-externals/Package_mingw_gccdlls.mk +++ /dev/null @@ -1,19 +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/. -# - -$(eval $(call gb_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin)) - -$(eval $(call gb_Package_set_outdir,mingw_gccdlls,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,mingw_gccdlls,program,\ - $(if $(MINGW_SHARED_GCCLIB),$(MINGW_GCCDLL)) \ - $(if $(MINGW_SHARED_GXXLIB),$(MINGW_GXXDLL)) \ -)) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mysqlcppconn/Library_mysqlcppconn.mk b/external/mysqlcppconn/Library_mysqlcppconn.mk index 8b6202fa7d4e..e2894824bc18 100644 --- a/external/mysqlcppconn/Library_mysqlcppconn.mk +++ b/external/mysqlcppconn/Library_mysqlcppconn.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Library_use_externals,mysqlcppconn, \ mariadb \ )) -ifneq ($(OS)$(COM),WNTMSC) +ifneq ($(OS),WNT) $(eval $(call gb_Library_add_libs,mysqlcppconn,\ $(if $(filter-out MACOSX,$(OS)),-ldl) \ diff --git a/external/neon/neon.patch b/external/neon/neon.patch index b86b613d7294..fa0c1938d4aa 100644 --- a/external/neon/neon.patch +++ b/external/neon/neon.patch @@ -95,17 +95,6 @@ /* Set callbacks to provide credentials for server and proxy * authentication, using the default set of authentication protocols. ---- src/ne_defs.h 2010-01-11 23:57:34.000000000 +0100 -+++ src/ne_defs.h 2011-02-03 10:26:20.000000000 +0100 -@@ -41,7 +41,7 @@ - #endif - - /* define ssize_t for Win32 */ --#if defined(WIN32) && !defined(ssize_t) -+#if defined(WIN32) && !defined(ssize_t) && !defined(__MINGW32__) - #define ssize_t int - #endif - --- src/ne_locks.c 2007-02-05 11:09:27.000000000 +0100 +++ src/ne_locks.c 2011-02-03 10:26:21.000000000 +0100 @@ -579,6 +579,23 @@ diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 07cc472b9fb2..57a78b4a850c 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,nss,configure): ,,nss_configure.log) ifeq ($(OS),WNT) -ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ $(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \ @@ -38,26 +37,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \ ,nss) - -else -$(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) - $(call gb_ExternalProject_run,build,\ - $(MAKE) -j1 nss_build_all \ - NS_USE_GCC=1 \ - CC="$(CC) $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - CXX="$(CXX) $(if $(MINGW_SHARED_GCCLIB),-shared-libgcc)" \ - OS_LIBS="-ladvapi32 -lws2_32 -lmswsock -lwinmm $(if $(MINGW_SHARED_GXXLIB),$(MINGW_SHARED_LIBSTDCPP))" \ - LDFLAGS="" \ - PATH="$(PATH)" \ - RANLIB="$(RANLIB)" \ - OS_TARGET=WINNT RC="$(WINDRES)" OS_RELEASE="5.0" \ - IMPORT_LIB_SUFFIX=dll.a \ - NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-shared --disable-static" \ - NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py" \ - && rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \ - ,nss) - -endif else # OS!=WNT $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python) $(call gb_ExternalProject_run,build,\ diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index a0ac57173fd1..7200e6ffdf65 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -17,12 +17,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-3.13.5-zlib-werror.patch \ external/nss/nss_macosx.patch \ external/nss/nss-win32-make.patch.1 \ - $(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch \ + $(if $(filter WNT,$(OS)),external/nss/nss.windows.patch \ external/nss/nss.nowerror.patch \ external/nss/nss.vs2015.patch) \ - $(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \ - external/nss/nss-3.13.3-build.patch.3 \ - external/nss/nss.mingw.patch.3) \ external/nss/ubsan.patch.0 \ external/nss/clang-cl.patch.0 \ external/nss/nss.windowbuild.patch.0 \ @@ -32,11 +29,11 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss-ios.patch) \ $(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \ external/nss/nss.cygwin64.in32bit.patch) \ - $(if $(filter WNTMSC,$(OS)$(COM)), \ + $(if $(filter WNT,$(OS)), \ external/nss/nss.vs2015.pdb.patch) \ $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)), \ external/nss/nss-winXP-sdk.patch.1) \ - $(if $(filter WNTMSC,$(OS)$(COM)), \ + $(if $(filter WNT,$(OS)), \ external/nss/nss.utf8bom.patch.1) \ )) diff --git a/external/nss/nspr-4.9-build.patch.3 b/external/nss/nspr-4.9-build.patch.3 deleted file mode 100644 index 6f80f8023569..000000000000 --- a/external/nss/nspr-4.9-build.patch.3 +++ /dev/null @@ -1,285 +0,0 @@ ---- a/a/a/nspr/config/autoconf.mk.in 2011-08-29 19:02:51.000000000 +0200 -+++ a/a/a/nspr/config/autoconf.mk.in 2012-03-22 11:24:22.137097336 +0100 -@@ -27,6 +27,7 @@ - OBJ_SUFFIX = $(error config/config.mk needs to be included before using OBJ_SUFFIX) - _OBJ_SUFFIX = @OBJ_SUFFIX@ - LIB_SUFFIX = @LIB_SUFFIX@ -+IMPORT_LIB_SUFFIX = @IMPORT_LIB_SUFFIX@ - DLL_SUFFIX = @DLL_SUFFIX@ - ASM_SUFFIX = @ASM_SUFFIX@ - MOD_NAME = @NSPR_MODNAME@ ---- a/a/a/nspr/config/rules.mk 2011-08-29 19:02:51.000000000 +0200 -+++ a/a/a/nspr/config/rules.mk 2012-03-22 11:24:22.138097311 +0100 -@@ -115,21 +115,21 @@ - # - - ifdef LIBRARY_NAME --ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH))) -+ifeq (,$(filter-out Linux WIN95 WINNT WINCE OS2,$(OS_ARCH))) - - # - # Win95 and OS/2 require library names conforming to the 8.3 rule. - # other platforms do not. - # --ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET))) -+ifeq (,$(filter-out WIN95 WINCE WINMO WINNT OS2,$(OS_TARGET))) - LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) - SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb - else - LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) - SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb - endif - ---- a/a/a/nspr/configure 2012-02-14 20:06:00.000000000 +0100 -+++ a/a/a/nspr/configure 2012-03-22 11:24:22.139097286 +0100 -@@ -3034,6 +3034,7 @@ - - OBJ_SUFFIX=o - LIB_SUFFIX=a -+IMPORT_LIB_SUFFIX=$IMPORT_LIB_SUFFIX - DLL_SUFFIX=so - ASM_SUFFIX=s - MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -@@ -4536,6 +4537,7 @@ - CC="$CC -mwindows" - CXX="$CXX -mwindows" - DLL_SUFFIX=dll -+ IMPORT_LIB_SUFFIX=dll.a - MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' - RC=$WINDRES - # Use temp file for windres (bug 213281) -@@ -4552,6 +4554,7 @@ - GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb' - OBJ_SUFFIX=obj - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - - # Determine compiler version -@@ -4661,11 +4664,11 @@ - - if test "$OS_TARGET" = "WINNT"; then - CFLAGS="$CFLAGS -GT" -- LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -- LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -+ LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' -+ LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' - else -- LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -- LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -+ LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' -+ LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' - fi - fi # GNU_CC - -@@ -4775,6 +4778,7 @@ - - OBJ_SUFFIX=obj - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - MKSHLIB='$(LD) -DLL $(DSO_LDOPTS) -OUT:$@' - -@@ -4782,8 +4786,8 @@ - RESOLVE_LINK_SYMBOLS=1 - - MDCPUCFG_H=_win95.cfg -- LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -- LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -+ LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' -+ LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' - - DLLFLAGS='-OUT:"$@"' - if test -n "$MOZ_DEBUG_SYMBOLS"; then -@@ -5584,6 +5588,7 @@ - - USE_PTHREADS=1 - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - MKSHLIB= - DSO_LDOPTS= -@@ -5668,6 +5673,7 @@ - EOF - - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - RC=rc.exe - PR_MD_ARCH_DIR=os2 -@@ -6966,6 +6972,7 @@ - s%@CPU_ARCH@%$CPU_ARCH%g - s%@OBJ_SUFFIX@%$OBJ_SUFFIX%g - s%@LIB_SUFFIX@%$LIB_SUFFIX%g -+s%@IMPORT_LIB_SUFFIX@%$IMPORT_LIB_SUFFIX%g - s%@DLL_SUFFIX@%$DLL_SUFFIX%g - s%@ASM_SUFFIX@%$ASM_SUFFIX%g - s%@WRAP_LDFLAGS@%$WRAP_LDFLAGS%g ---- a/a/a/nspr/configure.in 2012-02-14 20:06:00.000000000 +0100 -+++ a/a/a/nspr/configure.in 2012-03-22 11:24:22.139097286 +0100 -@@ -834,6 +834,7 @@ - dnl ======================================================== - OBJ_SUFFIX=o - LIB_SUFFIX=a -+IMPORT_LIB_SUFFIX=$(IMPORT_LIB_SUFFIX) - DLL_SUFFIX=so - ASM_SUFFIX=s - MKSHLIB='$(LD) $(DSO_LDOPTS) -o $@' -@@ -1901,6 +1902,7 @@ - CC="$CC -mwindows" - CXX="$CXX -mwindows" - DLL_SUFFIX=dll -+ IMPORT_LIB_SUFFIX=dll.a - MKSHLIB='$(CC) -shared -Wl,--export-all-symbols -Wl,--out-implib -Wl,$(IMPORT_LIBRARY) $(DLLBASE) -o $(subst $(OBJDIR)/,,$(SHARED_LIBRARY))' - RC=$WINDRES - # Use temp file for windres (bug 213281) -@@ -1917,6 +1919,7 @@ - GARBAGE='$(OBJDIR)/vc20.pdb $(OBJDIR)/vc40.pdb' - OBJ_SUFFIX=obj - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - - # Determine compiler version -@@ -2014,11 +2017,11 @@ - - if test "$OS_TARGET" = "WINNT"; then - CFLAGS="$CFLAGS -GT" -- LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -- LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -+ LIBNSPR='$(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' -+ LIBPLC='$(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' - else -- LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -- LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -+ LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' -+ LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' - fi - fi # GNU_CC - -@@ -2089,6 +2092,7 @@ - - OBJ_SUFFIX=obj - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - MKSHLIB='$(LD) -DLL $(DSO_LDOPTS) -OUT:$@' - -@@ -2096,8 +2100,8 @@ - RESOLVE_LINK_SYMBOLS=1 - - MDCPUCFG_H=_win95.cfg -- LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -- LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX)' -+ LIBNSPR='$(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' -+ LIBPLC='$(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(IMPORT_LIB_SUFFIX)' - - DLLFLAGS='-OUT:"$@"' - if test -n "$MOZ_DEBUG_SYMBOLS"; then -@@ -2576,6 +2580,7 @@ - AC_DEFINE(HAVE_SOCKLEN_T) - USE_PTHREADS=1 - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - MKSHLIB= - DSO_LDOPTS= -@@ -2630,6 +2635,7 @@ - AC_DEFINE(BSD_SELECT) - AC_DEFINE(TCPV40HDRS) - LIB_SUFFIX=lib -+ IMPORT_LIB_SUFFIX=lib - DLL_SUFFIX=dll - RC=rc.exe - PR_MD_ARCH_DIR=os2 -@@ -3291,6 +3297,7 @@ - - AC_SUBST(OBJ_SUFFIX) - AC_SUBST(LIB_SUFFIX) -+AC_SUBST(IMPORT_LIB_SUFFIX) - AC_SUBST(DLL_SUFFIX) - AC_SUBST(ASM_SUFFIX) - AC_SUBST(WRAP_LDFLAGS) ---- a/a/a/nspr/pr/include/md/_win95.cfg 2010-01-27 03:45:49.000000000 +0100 -+++ a/a/a/nspr/pr/include/md/_win95.cfg 2012-03-22 11:24:22.139097286 +0100 -@@ -106,7 +106,7 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - --#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) -+#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) || defined (_WIN64) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN ---- a/a/a/nspr/pr/include/md/_winnt.cfg 2010-01-27 03:45:49.000000000 +0100 -+++ a/a/a/nspr/pr/include/md/_winnt.cfg 2012-03-22 11:24:22.140097261 +0100 -@@ -100,7 +100,7 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 2 - --#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) -+#elif defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_) || defined (_WIN64) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN ---- a/a/a/nspr/pr/src/Makefile.in 2011-09-22 17:21:06.000000000 +0200 -+++ a/a/a/nspr/pr/src/Makefile.in 2012-03-22 11:24:22.140097261 +0100 -@@ -9,6 +9,9 @@ - topsrcdir = @top_srcdir@ - srcdir = @srcdir@ - VPATH = @srcdir@ -+ -+LIBRARY_NAME = nspr -+LIBRARY_VERSION = $(MOD_MAJOR_VERSION) - - include $(MOD_DEPTH)/config/autoconf.mk - -@@ -200,9 +200,9 @@ - - ifeq ($(OS_ARCH),WINNT) - ifdef NS_USE_GCC --OS_LIBS = -ladvapi32 -lwsock32 -lwinmm -+OS_LIBS = -ladvapi32 -lws2_32 -lmswsock -lwinmm - else --OS_LIBS = advapi32.lib wsock32.lib winmm.lib -+OS_LIBS = advapi32.lib ws2_32.lib mswsock.lib winmm.lib - endif - endif - -@@ -291,8 +291,6 @@ - include $(srcdir)/bthreads/objs.mk - endif - --LIBRARY_NAME = nspr --LIBRARY_VERSION = $(MOD_MAJOR_VERSION) - - RELEASE_LIBS = $(TARGETS) - ---- a/a/a/nspr/pr/src/md/windows/ntgc.c 2010-11-30 00:26:19.000000000 +0100 -+++ a/a/a/nspr/pr/src/md/windows/ntgc.c 2012-03-22 11:24:22.140097261 +0100 -@@ -44,7 +44,7 @@ - - PRWord *_MD_HomeGCRegisters(PRThread *t, int isCurrent, int *np) - { --#if defined(_X86_) -+#if defined(_X86_) && (!defined(_AMD64_)) - CONTEXT context; - context.ContextFlags = CONTEXT_INTEGER; - ---- a/a/a/nspr/tools/Makefile.in 2008-05-04 00:28:44.000000000 +0200 -+++ a/a/a/nspr/tools/Makefile.in 2012-03-22 11:24:22.140097261 +0100 -@@ -219,7 +219,7 @@ - echo winsock.lib >>w16link - wlink @w16link. - else -- link $(LDOPTS) $< $(LIBPR) $(LIBPLC) wsock32.lib -out:$@ -+ link $(LDOPTS) $< $(LIBPR) $(LIBPLC) ws2_32.lib mswsock.lib -out:$@ - endif - else - ifeq ($(OS_ARCH),OS2) diff --git a/external/nss/nss-3.13.3-build.patch.3 b/external/nss/nss-3.13.3-build.patch.3 deleted file mode 100644 index 383b9384a9c8..000000000000 --- a/external/nss/nss-3.13.3-build.patch.3 +++ /dev/null @@ -1,231 +0,0 @@ ---- a/a/a/nss/coreconf/rules.mk 2013-06-14 13:31:28.569204870 +0100 -+++ a/a/a/nss/coreconf/rules.mk 2013-06-14 13:31:59.277567709 +0100 -@@ -400,7 +400,7 @@ - PWD := $(shell pwd) - ifeq (,$(findstring ;,$(PATH))) - ifndef USE_MSYS --PWD := $(subst \,/,$(shell cygpath -w $(PWD))) -+#PWD := $(subst \,/,$(shell cygpath -w $(PWD))) - endif - endif - endif ---- a/a/a/nss/coreconf/WIN32.mk 2013-06-14 13:31:28.557204728 +0100 -+++ a/a/a/nss/coreconf/WIN32.mk 2013-06-14 13:31:59.278567724 +0100 -@@ -124,7 +124,7 @@ - # The -mnop-fun-dllimport flag allows us to avoid a drawback of - # the dllimport attribute that a pointer to a function marked as - # dllimport cannot be used as as a constant address. -- OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -+ OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport -D_WIN32_IE=0x0700 -U__MMX__ -U__SSE__ -U__SSE2__ - _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY) - DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB)) - ifdef BUILD_OPT ---- a/a/a/nss/coreconf/WINNT.mk 2013-06-14 13:31:28.560204763 +0100 -+++ a/a/a/nss/coreconf/WINNT.mk 2013-06-14 13:31:59.278567724 +0100 -@@ -46,7 +46,7 @@ - # - # Win NT needs -GT so that fibers can work - # --OS_CFLAGS += -GT -+#OS_CFLAGS += -GT - - # WINNT uses the lib prefix, Win95 doesn't - NSPR31_LIB_PREFIX = lib ---- a/a/a/nss/cmd/crmftest/Makefile 2013-06-14 13:31:28.678206158 +0100 -+++ a/a/a/nss/cmd/crmftest/Makefile 2013-06-14 13:31:59.278567724 +0100 -@@ -90,7 +90,7 @@ - LDDIST = $(DIST)/lib - - ifeq (,$(filter-out WIN%,$(OS_TARGET))) --EXTRA_LIBS += $(LDDIST)/sectool.lib -+#EXTRA_LIBS += $(LDDIST)/sectool.lib - endif - - include ../platrules.mk ---- a/a/a/nss/cmd/pk11mode/Makefile 2013-06-14 13:31:28.709206524 +0100 -+++ a/a/a/nss/cmd/pk11mode/Makefile 2013-06-14 13:31:59.279567738 +0100 -@@ -61,9 +61,9 @@ - ifeq ($(OS_ARCH), WINNT) - - EXTRA_LIBS += \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \ - $(NULL) - - else ---- a/a/a/nss/cmd/shlibsign/Makefile 2013-06-14 13:31:28.680206181 +0100 -+++ a/a/a/nss/cmd/shlibsign/Makefile 2013-06-14 13:31:59.279567738 +0100 -@@ -59,9 +59,9 @@ - ifeq ($(OS_ARCH), WINNT) - - EXTRA_LIBS += \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \ - $(NULL) - - else -@@ -93,8 +93,8 @@ - endif - CHECKLOC = $(CHECKLIBS:.$(DLL_SUFFIX)=.chk) - --MD_LIB_RELEASE_FILES = $(CHECKLOC) --ALL_TRASH += $(CHECKLOC) -+MD_LIB_RELEASE_FILES = # $(CHECKLOC) -+#ALL_TRASH += $(CHECKLOC) - endif - - ####################################################################### -@@ -128,5 +128,5 @@ - endif - endif - --libs install :: $(CHECKLOC) -+libs install :: #$(CHECKLOC) - ---- a/a/a/nss/cmd/shlibsign/mangle/Makefile 2013-06-14 13:31:28.681206193 +0100 -+++ a/a/a/nss/cmd/shlibsign/mangle/Makefile 2013-06-14 13:31:59.279567738 +0100 -@@ -59,9 +59,9 @@ - ifeq ($(OS_ARCH), WINNT) - - EXTRA_LIBS += \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ -- $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(IMPORT_LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(IMPORT_LIB_SUFFIX) \ -+ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)nspr4.$(IMPORT_LIB_SUFFIX) \ - $(NULL) - - else ---- a/a/a/nss/lib/ckfw/builtins/config.mk 2013-06-14 13:31:28.666206016 +0100 -+++ a/a/a/nss/lib/ckfw/builtins/config.mk 2013-06-14 13:31:59.280567750 +0100 -@@ -48,7 +48,7 @@ - - ifeq (,$(filter-out WIN%,$(OS_TARGET))) - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -- RES = $(OBJDIR)/$(LIBRARY_NAME).res -+ RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc - endif - ---- a/a/a/nss/lib/ckfw/capi/Makefile 2013-06-14 13:31:28.669206051 +0100 -+++ a/a/a/nss/lib/ckfw/capi/Makefile 2013-06-14 13:31:59.280567750 +0100 -@@ -75,6 +75,9 @@ - -lplc4 \ - -lplds4 \ - -lnspr4 \ -+ -lcrypt32 \ -+ -ladvapi32 \ -+ -lrpcrt4 \ - $(NULL) - endif - ---- a/a/a/nss/lib/freebl/config.mk 2013-06-14 13:31:28.593205153 +0100 -+++ a/a/a/nss/lib/freebl/config.mk 2013-06-14 13:31:59.280567750 +0100 -@@ -82,7 +82,7 @@ - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) - --RES = $(OBJDIR)/$(LIBRARY_NAME).res -+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = freebl.rc - - ifdef NS_USE_GCC ---- a/a/a/nss/lib/freebl/mpi/mpi-priv.h 2013-06-14 13:31:28.605205295 +0100 -+++ a/a/a/nss/lib/freebl/mpi/mpi-priv.h 2013-06-14 13:31:59.281567762 +0100 -@@ -254,7 +254,7 @@ - #define MPI_ASM_DECL - #endif - --#ifdef MPI_AMD64 -+#if defined(MPI_AMD64) && defined(MP_ASSEMBLY_MULTIPLY) - - mp_digit MPI_ASM_DECL s_mpv_mul_set_vec64(mp_digit*, mp_digit *, mp_size, mp_digit); - mp_digit MPI_ASM_DECL s_mpv_mul_add_vec64(mp_digit*, const mp_digit*, mp_size, mp_digit); ---- a/a/a/nss/lib/nss/config.mk 2013-06-14 13:31:28.620205472 +0100 -+++ a/a/a/nss/lib/nss/config.mk 2013-06-14 13:31:59.281567762 +0100 -@@ -42,7 +42,7 @@ - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) - IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - --RES = $(OBJDIR)/$(LIBRARY_NAME).res -+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc - - ifdef NS_USE_GCC ---- a/a/a/nss/lib/smime/config.mk 2013-06-14 13:31:28.580205000 +0100 -+++ a/a/a/nss/lib/smime/config.mk 2013-06-14 13:31:59.282567773 +0100 -@@ -43,7 +43,7 @@ - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) - IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - --RES = $(OBJDIR)/smime.res -+RES = $(OBJDIR)/smime.res.o - RESNAME = smime.rc - - ifdef NS_USE_GCC ---- a/a/a/nss/lib/softoken/config.mk 2013-06-14 13:31:28.662205969 +0100 -+++ a/a/a/nss/lib/softoken/config.mk 2013-06-14 13:31:59.282567773 +0100 -@@ -49,7 +49,7 @@ - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) - IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - --RES = $(OBJDIR)/$(LIBRARY_NAME).res -+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc - - ifdef NS_USE_GCC ---- a/a/a/nss/lib/softoken/legacydb/config.mk 2013-06-14 13:31:28.660205945 +0100 -+++ a/a/a/nss/lib/softoken/legacydb/config.mk 2013-06-14 13:31:59.282567773 +0100 -@@ -50,7 +50,7 @@ - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) - IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - --RES = $(OBJDIR)/$(LIBRARY_NAME).res -+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc - - ifdef NS_USE_GCC ---- a/a/a/nss/lib/ssl/config.mk 2013-06-14 13:31:28.614205402 +0100 -+++ a/a/a/nss/lib/ssl/config.mk 2013-06-14 13:31:59.283567784 +0100 -@@ -55,7 +55,7 @@ - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) - IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - --RES = $(OBJDIR)/ssl.res -+RES = $(OBJDIR)/ssl.res.o - RESNAME = ssl.rc - - ifdef NS_USE_GCC ---- a/a/a/nss/lib/sysinit/config.mk 2013-06-14 13:31:28.674206110 +0100 -+++ a/a/a/nss/lib/sysinit/config.mk 2013-06-14 13:31:59.283567784 +0100 -@@ -47,8 +47,8 @@ - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) - IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - --RES = $(OBJDIR)/$(LIBRARY_NAME).res --RESNAME = $(LIBRARY_NAME).rc -+#RES = $(OBJDIR)/$(LIBRARY_NAME).res -+#RESNAME = $(LIBRARY_NAME).rc - - ifdef NS_USE_GCC - EXTRA_SHARED_LIBS += \ ---- a/a/a/nss/lib/util/config.mk 2013-06-14 13:31:28.629205579 +0100 -+++ a/a/a/nss/lib/util/config.mk 2013-06-14 13:31:59.283567784 +0100 -@@ -42,7 +42,7 @@ - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) - IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) - --RES = $(OBJDIR)/$(LIBRARY_NAME).res -+RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc - - ifdef NS_USE_GCC diff --git a/external/nss/nss.mingw.patch.3 b/external/nss/nss.mingw.patch.3 deleted file mode 100644 index 53aecc515731..000000000000 --- a/external/nss/nss.mingw.patch.3 +++ /dev/null @@ -1,106 +0,0 @@ ---- a/a/a/nspr/config/Makefile.in.dt 2012-10-29 13:30:49.244696426 +0100 -+++ a/a/a/nspr/config/Makefile.in 2012-10-29 13:31:26.541830215 +0100 -@@ -30,7 +30,6 @@ CSRCS = now.c - - # This version hasn't been ported for us; the one in mozilla/config has - ifneq ($(OS_ARCH),OS2) --CSRCS += nsinstall.c - - PLSRCS = nfspwd.pl - endif -@@ -84,7 +83,6 @@ else - ifeq (,$(filter-out SYMBIAN WINCE,$(OS_ARCH))) - TARGETS = $(PROGS) - else --PROGS += $(OBJDIR)/nsinstall$(PROG_SUFFIX) - TARGETS = $(PROGS) $(PLSRCS:.pl=) - endif - endif ---- a/a/a/nss/lib/nss/config.mk.dt 2012-10-30 12:31:06.675726730 +0100 -+++ a/a/a/nss/lib/nss/config.mk 2012-10-30 12:31:08.860676053 +0100 -@@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc ---- a/a/a/nss/lib/smime/config.mk.dt 2012-10-30 12:30:52.020062600 +0100 -+++ a/a/a/nss/lib/smime/config.mk 2012-10-30 12:30:54.504004586 +0100 -@@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/smime.res.o - RESNAME = smime.rc ---- a/a/a/nss/lib/softoken/config.mk.dt 2012-10-30 12:31:02.707816790 +0100 -+++ a/a/a/nss/lib/softoken/config.mk 2012-10-30 12:31:04.388778631 +0100 -@@ -47,7 +47,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc ---- a/a/a/nss/lib/softoken/legacydb/config.mk.dt 2012-10-30 12:30:56.531958414 +0100 -+++ a/a/a/nss/lib/softoken/legacydb/config.mk 2012-10-30 12:31:00.575865594 +0100 -@@ -48,7 +48,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc ---- a/a/a/nss/lib/sqlite/config.mk.dt 2012-10-30 12:31:10.499638736 +0100 -+++ a/a/a/nss/lib/sqlite/config.mk 2012-10-30 12:31:12.624590177 +0100 -@@ -41,7 +41,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - #RES = $(OBJDIR)/$(LIBRARY_NAME).res - #RESNAME = $(LIBRARY_NAME).rc ---- a/a/a/nss/lib/ssl/config.mk.dt 2012-10-30 12:31:14.882539495 +0100 -+++ a/a/a/nss/lib/ssl/config.mk 2012-10-30 12:31:16.379504032 +0100 -@@ -53,7 +53,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/ssl.res.o - RESNAME = ssl.rc ---- a/a/a/nss/lib/sysinit/config.mk.dt 2012-10-30 12:31:18.195462428 +0100 -+++ a/a/a/nss/lib/sysinit/config.mk 2012-10-30 12:31:20.277414942 +0100 -@@ -45,7 +45,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - #RES = $(OBJDIR)/$(LIBRARY_NAME).res - #RESNAME = $(LIBRARY_NAME).rc ---- a/a/a/nss/lib/util/config.mk.dt 2012-10-30 12:31:22.179371231 +0100 -+++ a/a/a/nss/lib/util/config.mk 2012-10-30 12:31:24.074328169 +0100 -@@ -40,7 +40,7 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET))) - - # don't want the 32 in the shared library name - SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) --IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION)$(IMPORT_LIB_SUFFIX) -+IMPORT_LIBRARY = $(OBJDIR)/$(IMPORT_LIB_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(IMPORT_LIB_SUFFIX) - - RES = $(OBJDIR)/$(LIBRARY_NAME).res.o - RESNAME = $(LIBRARY_NAME).rc diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index aa25c3a776de..941da5b14eeb 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -42,11 +42,7 @@ OPENSSL_PLATFORM := \ ios-armv7\ ,\ $(if $(filter WNT,$(OS)),\ - $(if $(filter GCC,$(COM)),\ - mingw\ - ,\ - $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\ - )\ + $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\ ,\ $(if $(filter MACOSX,$(OS)),\ $(if $(filter POWERPC,$(CPUNAME)),darwin-ppc-cc)\ diff --git a/external/openssl/UnpackedTarball_openssl.mk b/external/openssl/UnpackedTarball_openssl.mk index 9fc5f72656e3..5845e31a436a 100644 --- a/external/openssl/UnpackedTarball_openssl.mk +++ b/external/openssl/UnpackedTarball_openssl.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl $(eval $(call gb_UnpackedTarball_add_patches,openssl,\ external/openssl/openssllnx.patch \ - external/openssl/opensslmingw.patch \ external/openssl/opensslwnt.patch \ external/openssl/openssl-1.0.1h-win64.patch.1 \ external/openssl/opensslsol.patch \ diff --git a/external/openssl/opensslmingw.patch b/external/openssl/opensslmingw.patch deleted file mode 100644 index 2a8729cbc26e..000000000000 --- a/external/openssl/opensslmingw.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -ru openssl.orig/Makefile.shared openssl/Makefile.shared ---- a/openssl.orig/Makefile.shared 2016-03-03 21:16:48.751822016 +0100 -+++ b/openssl/Makefile.shared 2016-03-03 21:27:12.615802449 +0100 -@@ -278,7 +278,7 @@ - link_a.cygwin: - @ $(CALC_VERSIONS); \ - INHIBIT_SYMLINKS=yes; \ -- SHLIB=cyg$(LIBNAME); SHLIB_SOVER=-$(LIBVERSION); SHLIB_SUFFIX=.dll; \ -+ SHLIB=cyg$(LIBNAME); SHLIB_SOVER=; SHLIB_SUFFIX=.dll; \ - dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; extras=; \ - base=-Wl,--enable-auto-image-base; \ - if expr $(PLATFORM) : 'mingw' > /dev/null; then \ -@@ -289,7 +289,11 @@ - SHLIB_SOVER=32; \ - extras="$(LIBNAME).def"; \ - $(PERL) util/mkdef.pl 32 $$SHLIB > $$extras; \ -- base=; [ $(LIBNAME) = "crypto" -a -n "$(FIPSCANLIB)" ] && base=-Wl,--image-base,0x63000000; \ -+ base=; \ -+ if test $(LIBNAME) = "crypto"; then \ -+ SHLIB=libeay32; \ -+ base=-Wl,--image-base,0x63000000; \ -+ fi; \ - fi; \ - dll_name=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \ - $(PERL) util/mkrc.pl $$dll_name | \ -@@ -297,7 +301,7 @@ - extras="$$extras rc.o"; \ - ALLSYMSFLAGS='-Wl,--whole-archive'; \ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ -- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \ -+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared $$base -Wl,-s,-Bsymbolic -Wl,--export-all-symbols -Wl,--out-implib,lib$(LIBNAME).dll.a $$extras"; \ - [ -f apps/$$dll_name ] && rm apps/$$dll_name; \ - [ -f test/$$dll_name ] && rm test/$$dll_name; \ - $(LINK_SO_A) || exit 1; \ -diff -ru openssl.orig/e_os2.h openssl/e_os2.h ---- a/openssl.orig/e_os2.h 2016-03-01 14:35:53.000000000 +0100 -+++ b/openssl/e_os2.h 2016-03-03 21:27:33.179801804 +0100 -@@ -293,7 +293,7 @@ - # ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION - # define OPENSSL_IMPLEMENT_GLOBAL(type,name,value) \ - type *_shadow_##name(void) \ -- { static type _hide_##name=value; return &_hide_##name; } -+ { type _hide_##name=value; return &_hide_##name; } - # define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void) - # define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name())) - # else -diff -ru openssl.orig/ms/mingw32.bat openssl/ms/mingw32.bat ---- a/openssl.orig/ms/mingw32.bat 2016-03-01 14:35:05.000000000 +0100 -+++ b/openssl/ms/mingw32.bat 2016-03-03 21:27:56.487801073 +0100 -@@ -75,15 +75,41 @@ - rem copy ms\tlhelp32.h outinc - - echo Building the libraries --mingw32-make -f ms/mingw32a.mak -+make -f ms/mingw32a.mak - if errorlevel 1 goto end - - echo Generating the DLLs and input libraries --dllwrap --dllname libeay32.dll --output-lib out/libeay32.a --def ms/libeay32.def out/libcrypto.a -lws2_32 -lgdi32 -+mv out/libcrypto.a out/libcrypto_static.a -+mv out/libssl.a out/libssl_static.a -+dlltool --dllname libeay32.dll --output-lib out/libcrypto.a --input-def ms/libeay32.def - if errorlevel 1 goto end --dllwrap --dllname libssl32.dll --output-lib out/libssl32.a --def ms/ssleay32.def out/libssl.a out/libeay32.a -+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lws2_32 -lgdi32 - if errorlevel 1 goto end -+dlltool --dllname ssleay32.dll --output-lib out/libssl.a --input-def ms/ssleay32.def -+if errorlevel 1 goto end -+if "%MINGW_SHARED_GXXLIB%"=="TRUE" goto shared_gxxlib -+if "%MINGW_SHARED_GCCLIB%"=="TRUE" goto shared_gcclib -+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lws2_32 -lgdi32 -+if errorlevel 1 goto end -+gcc --shared --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -+if errorlevel 1 goto end -+goto finished -+ -+:shared_gcclib -+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lws2_32 -lgdi32 -+if errorlevel 1 goto end -+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto -+if errorlevel 1 goto end -+goto finished - -+:shared_gxxlib -+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/libeay32.map ms/libeay32.def -o out/libeay32.dll out/libcrypto_static.a -lws2_32 -lgdi32 %MINGW_SHARED_LIBSTDSPP% -+if errorlevel 1 goto end -+gcc --shared -shared-libgcc --enable-pseudo-reloc -Wl,-Map,out/ssleay32.map -Lout ms/ssleay32.def -o out/ssleay32.dll out/libssl_static.a -lcrypto %MINGW_SHARED_LIBSTDSPP% -+if errorlevel 1 goto end -+goto finished -+ -+:finished - echo Done compiling OpenSSL - - :end -diff -ru openssl.orig/util/pl/Mingw32.pl openssl/util/pl/Mingw32.pl ---- a/openssl.orig/util/pl/Mingw32.pl 2016-03-01 14:33:04.000000000 +0100 -+++ b/openssl/util/pl/Mingw32.pl 2016-03-03 21:28:16.691800440 +0100 -@@ -6,11 +6,11 @@ - $o='/'; - $cp='cp'; - $rm='rm -f'; --$mkdir='gmkdir'; -+#$mkdir='gmkdir'; - --$o='\\'; --$cp='copy'; --$rm='del'; -+#$o='\\'; -+#$cp='copy'; -+#$rm='del'; - $mkdir='mkdir'; - - # C compiler stuff -@@ -85,7 +85,8 @@ - ($Name=$name) =~ tr/a-z/A-Z/; - - $ret.="$target: \$(${Name}OBJ)\n"; -- $ret.="\tif exist $target \$(RM) $target\n"; -+ $ret.="\t\$(RM) $target\n"; -+# $ret.="\tif exist $target \$(RM) $target\n"; - $ret.="\t\$(MKLIB) $target \$(${Name}OBJ)\n"; - $ret.="\t\$(RANLIB) $target\n\n"; - } diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1 index f44dad538010..577660580489 100644 --- a/external/poppler/poppler-snprintf.patch.1 +++ b/external/poppler/poppler-snprintf.patch.1 @@ -1,48 +1,33 @@ --- poppler-0.22.5/poppler/Catalog.cc 2013-06-09 12:16:12.000000000 +0200 +++ poppler-0.22.5/poppler/Catalog.cc 2013-07-08 16:54:30.712095880 +0200 -@@ -40,6 +40,14 @@ +@@ -40,6 +40,9 @@ #include <stddef.h> #include <stdlib.h> +#ifdef _WIN32 -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> +#endif #include "goo/gmem.h" #include "Object.h" #include "PDFDoc.h" --- poppler-0.22.5/poppler/GlobalParams.cc 2013-03-25 22:48:34.000000000 +0100 +++ poppler-0.22.5/poppler/GlobalParams.cc 2013-07-08 16:55:04.753303654 +0200 -@@ -57,6 +57,12 @@ +@@ -57,6 +57,7 @@ #ifdef _WIN32 # include <shlobj.h> # include <mbstring.h> -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> #endif #include "goo/gmem.h" #include "goo/GooString.h" --- poppler-0.22.5/poppler/PageLabelInfo.cc 2013-03-25 22:48:34.000000000 +0100 +++ poppler-0.22.5/poppler/PageLabelInfo.cc 2013-07-08 16:56:47.977901129 +0200 -@@ -17,6 +17,14 @@ +@@ -17,6 +17,9 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> +#ifdef _WIN32 -+# ifdef __MINGW32__ -+# define LO_SNPRINTF_DLLIMPORT -+# endif -+# ifdef _MSC_VER -+# include <systools/win32/snprintf.h> -+# endif ++# include <systools/win32/snprintf.h> +#endif #include "PageLabelInfo.h" diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index 11481117cf7e..85699503f627 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -19,7 +19,7 @@ $(eval $(call gb_ExternalProject_register_targets,postgresql,\ build \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) $(call gb_ExternalProject_get_state_target,postgresql,build) : $(call gb_ExternalProject_run,build,\ diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index 864c9cdcff30..8617e0efb34f 100644 --- a/external/python3/ExternalPackage_python3.mk +++ b/external/python3/ExternalPackage_python3.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3)) $(eval $(call gb_ExternalPackage_use_external_project,python3,python3)) -ifeq ($(OS)-$(COM),WNT-MSC) +ifeq ($(OS),WNT) ifeq ($(CPUNAME),X86_64) python_arch_subdir=amd64/ else @@ -38,10 +38,6 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor PCbuild/$(python_arch_subdir)unicodedata$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)winsound$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ )) -else ifeq ($(OS),WNT) # MinGW -# TODO how are C modules called on this platform? -$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,python.exe)) -$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,python$(PYTHON_VERSION_MAJOR).dll)) else $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin,python)) $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so)) @@ -123,7 +119,7 @@ endif # (+ toplevel for pyconfig.h) # that one is generated... -ifneq ($(OS)-$(COM),WNT-MSC) +ifneq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ LO_lib/_sysconfigdata.py \ )) diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index fefdd1ab3adf..2c97ef116491 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -24,7 +24,7 @@ $(eval $(call gb_ExternalProject_register_targets,python3,\ ) \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) # TODO: using Debug configuration and related mangling of pyconfig.h @@ -72,7 +72,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --disable-ipv6 --with-threads OPT="-g0 -fwrapv -O3 -Wall", \ $(if $(gb_Module_CURRENTMODULE_DEBUG_ENABLED), \ OPT="$(gb_COMPILERNOOPTFLAGS) $(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)")) \ - $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \ --with-universal-archs=intel \ @@ -93,8 +92,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \ $(if $(SYSTEM_ZLIB),,-L$(gb_StaticLibrary_WORKDIR)) \ $(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \ - $(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \ - $(if $(MINGW_SHARED_GCCLIB),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \ $(gb_LTOFLAGS) \ )" \ && MAKEFLAGS= $(MAKE) \ diff --git a/external/python33/ExternalPackage_python3.mk b/external/python33/ExternalPackage_python3.mk index 9341e9c498f2..86467bec5ca9 100644 --- a/external/python33/ExternalPackage_python3.mk +++ b/external/python33/ExternalPackage_python3.mk @@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3)) $(eval $(call gb_ExternalPackage_use_external_project,python3,python3)) -ifeq ($(OS)-$(COM),WNT-MSC) +ifeq ($(OS),WNT) ifeq ($(CPUNAME),X86_64) python_arch_subdir=amd64/ endif @@ -36,10 +36,6 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor PCbuild/$(python_arch_subdir)unicodedata$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ PCbuild/$(python_arch_subdir)winsound$(if $(MSVC_USE_DEBUG_RUNTIME),_d).pyd \ )) -else ifeq ($(OS),WNT) # MinGW -# TODO how are C modules called on this platform? -$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/bin/python.exe,python.exe)) -$(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python$(PYTHON_VERSION_MAJOR).dll,python$(PYTHON_VERSION_MAJOR).dll)) else $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/python.bin,python)) $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(PYTHON_VERSION_MAJOR).so,libpython$(PYTHON_VERSION_MAJOR).so)) @@ -116,7 +112,7 @@ endif # (+ toplevel for pyconfig.h) # that one is generated... -ifneq ($(OS)-$(COM),WNT-MSC) +ifneq ($(OS),WNT) $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib,\ LO_lib/_sysconfigdata.py \ )) diff --git a/external/python33/ExternalProject_python3.mk b/external/python33/ExternalProject_python3.mk index c7d3dc901c9b..577eb29f5129 100644 --- a/external/python33/ExternalProject_python3.mk +++ b/external/python33/ExternalProject_python3.mk @@ -24,7 +24,7 @@ $(eval $(call gb_ExternalProject_register_targets,python3,\ ) \ )) -ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(OS),WNT) # TODO: using Debug configuration and related mangling of pyconfig.h @@ -64,7 +64,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) : --disable-ipv6 --with-threads OPT="-g0 -fwrapv -O3 -Wall", \ $(if $(gb_Module_CURRENTMODULE_DEBUG_ENABLED), \ OPT="$(gb_COMPILERNOOPTFLAGS) $(gb_DEBUGINFO_FLAGS) $(gb_DEBUG_CFLAGS)")) \ - $(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \ $(if $(filter MACOSX,$(OS)), \ $(if $(filter INTEL,$(CPUNAME)),--enable-universalsdk=$(MACOSX_SDK_PATH) \ --with-universal-archs=intel \ @@ -84,8 +83,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) : $(if $(SYSTEM_OPENSSL),,-L$(call gb_UnpackedTarball_get_dir,openssl)) \ $(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \ $(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \ - $(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \ - $(if $(MINGW_SHARED_GCCLIB),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \ $(gb_LTOFLAGS) \ )" \ && MAKEFLAGS= $(MAKE) \ diff --git a/external/python33/UnpackedTarball_python3.mk b/external/python33/UnpackedTarball_python3.mk index d5db8b45c052..2b2f0be224b9 100644 --- a/external/python33/UnpackedTarball_python3.mk +++ b/external/python33/UnpackedTarball_python3.mk @@ -50,7 +50,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ )) endif -ifeq ($(OS)-$(COM),WNT-MSC) +ifeq ($(OS),WNT) ifneq ($(filter 120,$(VCVER)),) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python33/python-vc2013.patch.1 \ 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 */ |