dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2208 from mabrand/v6

Browse Source 
Update to mingw-w64 6.0
pull/2238/head
mabrand 6 years ago committed by GitHub
parent d7fcf40057 9764111350
commit 9f89537138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 534 additions and 211 deletions
Show Stats Download Patch File Download Diff File

37
src/aubio-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Tue, 5 Jan 2016 21:28:06 -0500
Subject: [PATCH 1/7] wscript: check HAVE_AV* from ctx.env
Subject: [PATCH 1/8] wscript: check HAVE_AV* from ctx.env
From https://github.com/aubio/aubio/commit/eb6899125ac83900710180c02b94bc593a1426d2
@ -26,7 +26,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 5 Jan 2016 21:47:01 -0500
Subject: [PATCH 2/7] wscript: check more variables from ctx.env
Subject: [PATCH 2/8] wscript: check more variables from ctx.env
diff --git a/wscript b/wscript
@ -52,7 +52,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 5 Jan 2016 22:48:20 -0500
Subject: [PATCH 3/7] wscript: fftw3 support requires pthreads
Subject: [PATCH 3/8] wscript: fftw3 support requires pthreads
diff --git a/wscript b/wscript
@ -74,7 +74,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 5 Jan 2016 22:18:21 -0500
Subject: [PATCH 4/7] wscript: Install static library
Subject: [PATCH 4/8] wscript: Install static library
diff --git a/src/wscript_build b/src/wscript_build
@ -93,7 +93,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 5 Jan 2016 21:15:37 -0500
Subject: [PATCH 5/7] Add options for enabling shared and/or static libraries
Subject: [PATCH 5/8] Add options for enabling shared and/or static libraries
diff --git a/src/wscript_build b/src/wscript_build
@ -153,7 +153,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 5 Jan 2016 21:25:46 -0500
Subject: [PATCH 6/7] Add static deps to pkgconfig file
Subject: [PATCH 6/8] Add static deps to pkgconfig file
diff --git a/aubio.pc.in b/aubio.pc.in
@ -236,7 +236,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 5 Jan 2016 21:27:05 -0500
Subject: [PATCH 7/7] disable tests and examples
Subject: [PATCH 7/8] disable tests and examples
diff --git a/wscript b/wscript
@ -256,3 +256,26 @@ index 1111111..2222222 100644
bld( source = 'aubio.pc.in' )
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: James Cowgill <jcowgill@jcowgill.uk>
Date: Sun, 25 Feb 2018 14:23:25 +0000
Subject: [PATCH 8/8] Fix build with FFmpeg 4.0
diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c
index 1111111..2222222 100644
--- a/src/io/source_avcodec.c
+++ b/src/io/source_avcodec.c
@@ -34,7 +34,11 @@
#include "fmat.h"
#include "source_avcodec.h"
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0)
#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
+#else
+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE
+#endif
struct _aubio_source_avcodec_t {
uint_t hop_size;

1
src/gcc.mk
Unescape View File

@ -76,6 +76,7 @@ define $(PKG)_BUILD_mingw-w64
cd '$(BUILD_DIR).crt' && '$(BUILD_DIR)/$(mingw-w64_SUBDIR)/mingw-w64-crt/configure' \
--host='$(TARGET)' \
--prefix='$(PREFIX)/$(TARGET)' \
--with-default-msvcrt=msvcrt \
@gcc-crt-config-opts@
$(MAKE) -C '$(BUILD_DIR).crt' -j '$(JOBS)' || $(MAKE) -C '$(BUILD_DIR).crt' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR).crt' -j 1 $(INSTALL_STRIP_TOOLCHAIN)

45
src/libmysqlclient-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 6 Sep 2015 22:34:47 +0100
Subject: [PATCH 01/11] use comp_err tool built in native build
Subject: [PATCH 01/12] use comp_err tool built in native build
See http://www.vtk.org/Wiki/CMake_Cross_Compiling#Using_executables_in_the_build_created_during_the_build
@ -47,7 +47,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Sun, 6 Sep 2015 22:53:33 +0100
Subject: [PATCH 02/11] fix extra qualification 'Handshake::'
Subject: [PATCH 02/12] fix extra qualification 'Handshake::'
Compilation error.
@ -68,7 +68,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 22:59:18 +0100
Subject: [PATCH 03/11] fix case in headers and libs (should be lowercase)
Subject: [PATCH 03/12] fix case in headers and libs (should be lowercase)
diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
@ -127,7 +127,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 23:01:35 +0100
Subject: [PATCH 04/11] define missing types
Subject: [PATCH 04/12] define missing types
We do not use types CERT_NAME_BLOB and CRYPT_HASH_BLOB,
though they are used in mprapi.h. And are not defined!
@ -150,7 +150,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Mon, 7 Sep 2015 23:04:23 +0100
Subject: [PATCH 05/11] macro NATIVE_WIN32 for stuff we don't have here
Subject: [PATCH 05/12] macro NATIVE_WIN32 for stuff we don't have here
Macro NATIVE_WIN32 is undefined in MXE. It is used instead of _WIN32
in #ifdef's where working variant is Unix and not Win32:
@ -261,7 +261,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 8 Oct 2015 13:30:53 +1100
Subject: [PATCH 06/11] fix shared lib names
Subject: [PATCH 06/12] fix shared lib names
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
@ -299,7 +299,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Thu, 8 Oct 2015 19:36:35 +1100
Subject: [PATCH 07/11] allow install of mysql_config
Subject: [PATCH 07/12] allow install of mysql_config
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@ -319,7 +319,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 11 Nov 2015 07:44:44 +0000
Subject: [PATCH 08/11] add 'static' to some inline functions
Subject: [PATCH 08/12] add 'static' to some inline functions
Fix https://gist.github.com/starius/71d5f276d62e58f36d2f
See also http://stackoverflow.com/a/8502046
@ -350,7 +350,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Wed, 16 Dec 2015 17:39:28 +0100
Subject: [PATCH 09/11] fix CMake error if dir contains special regex char
Subject: [PATCH 09/12] fix CMake error if dir contains special regex char
See https://github.com/mxe/mxe/issues/1030
@ -374,7 +374,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "fix@me" <fix@me>
Date: Fri, 13 Nov 2015 10:22:12 -0500
Subject: [PATCH 10/11] For Windows, check if POSIX thread model or win32
Subject: [PATCH 10/12] For Windows, check if POSIX thread model or win32
thread model is being used.
@ -454,7 +454,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 8 Feb 2017 11:51:42 +1100
Subject: [PATCH 11/11] only define localtime_r and gmtime_r when pthreads
Subject: [PATCH 11/12] only define localtime_r and gmtime_r when pthreads
isn't used
@ -471,3 +471,26 @@ index 1111111..2222222 100644
/****************************************************************************
** Replacements for localtime_r and gmtime_r
****************************************************************************/
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 17 Sep 2018 11:04:30 +0200
Subject: [PATCH 12/12] mingw-w64 6 fix
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c
index 1111111..2222222 100644
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.c
@@ -137,9 +137,11 @@ my_bool my_gethwaddr(uchar *to)
#define VOID void
#endif
+#if __MINGW64_VERSION_MAJOR < 6
// mprapi.h uses these undefined types
#define CERT_NAME_BLOB int
#define CRYPT_HASH_BLOB int
+#endif
#include <iphlpapi.h>
/*

151
src/mingw-w64-1.patch
Unescape View File

@ -39,136 +39,23 @@ Signed-off-by: Jonathan Yong <10walls@gmail.com>
Taken from: https://sourceforge.net/p/mingw-w64/mailman/message/36166386/
diff --git a/mingw-w64-crt/lib32/dwmapi.def b/mingw-w64-crt/lib32/dwmapi.def
index 1111111..2222222 100644
--- a/mingw-w64-crt/lib32/dwmapi.def
+++ b/mingw-w64-crt/lib32/dwmapi.def
@@ -5,47 +5,29 @@
;
LIBRARY "dwmapi.dll"
EXPORTS
-;ord_100@32 @100
-;ord_101@24 @101
+DwmpDxGetWindowSharedSurface@32
+DwmpDxUpdateWindowSharedSurface@24
DwmEnableComposition@4
-;ord_103@0 @103
-;ord_104@12 @104
-;ord_105@0 @105
-;ord_106@8 @106
-;ord_107@4 @107
-;ord_108@4 @108
-;ord_109@8 @109
-;ord_110@0 @110
DwmAttachMilContent@4
-;ord_112@4 @112
-;ord_113@16 @113
-;ord_114@8 @114
-;ord_115@4 @115
DwmDefWindowProc@20
DwmDetachMilContent@4
-;ord_118@8 @118
-;ord_119@8 @119
-;ord_120@8 @120
-;ord_121@8 @121
DwmEnableBlurBehindWindow@8
DwmEnableMMCSS@4
-;ord_124@20 @124
-;ord_125@12 @125
-;ord_126@8 @126
-;ord_127@4 @127
-;ord_128@4 @128
-;ord_129@4 @129
-;ord_130@0 @130
-;ord_131@8 @131
-;ord_132@8 @132
-;ord_133@36 @133
-;ord_134@8 @134
DwmExtendFrameIntoClientArea@8
DwmFlush@0
DwmGetColorizationColor@8
+DwmpDxBindSwapChain@12
+DwmpDxUnbindSwapChain@8
+DwmpDxgiIsThreadDesktopComposited@4
DwmGetCompositionTimingInfo@8
DwmGetGraphicsStreamClient@8
+DwmpDxUpdateWindowRedirectionBltSurface@36
+DwmpRenderFlick@12
+DwmpAllocateSecurityDescriptor@8
+DwmpFreeSecurityDescriptor@4
+DwmpEnableDDASupport@0
DwmGetGraphicsStreamTransformHint@8
+DwmTetherTextContact@20
DwmGetTransportAttributes@12
DwmGetWindowAttribute@16
DwmInvalidateIconicBitmaps@4
@@ -53,10 +35,14 @@ DwmIsCompositionEnabled@4
DwmModifyPreviousDxFrameDuration@12
DwmQueryThumbnailSourceSize@8
DwmRegisterThumbnail@12
+DwmRenderGesture@16
DwmSetDxFrameDuration@8
DwmSetIconicLivePreviewBitmap@16
DwmSetIconicThumbnail@12
DwmSetPresentParameters@8
DwmSetWindowAttribute@16
+DwmShowContact@8
+DwmTetherContact@16
+DwmTransitionOwnedWindow@8
DwmUnregisterThumbnail@4
DwmUpdateThumbnailProperties@8
diff --git a/mingw-w64-crt/lib64/dwmapi.def b/mingw-w64-crt/lib64/dwmapi.def
diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
index 1111111..2222222 100644
--- a/mingw-w64-crt/lib64/dwmapi.def
+++ b/mingw-w64-crt/lib64/dwmapi.def
@@ -1,8 +1,13 @@
;
-; Exports of file dwmapi.dll
+; Definition file of dwmapi.dll
+; Automatic generated by gendef
+; written by Kai Tietz 2008
;
-LIBRARY dwmapi.dll
+LIBRARY "dwmapi.dll"
EXPORTS
+DwmpDxGetWindowSharedSurface
+DwmpDxUpdateWindowSharedSurface
+DwmEnableComposition
DwmAttachMilContent
DwmDefWindowProc
DwmDetachMilContent
@@ -12,18 +17,33 @@ DwmEnableMMCSS
DwmExtendFrameIntoClientArea
DwmFlush
DwmGetColorizationColor
+DwmpDxBindSwapChain
+DwmpDxUnbindSwapChain
+DwmpDxgiIsThreadDesktopComposited
DwmGetCompositionTimingInfo
DwmGetGraphicsStreamClient
+DwmpDxUpdateWindowRedirectionBltSurface
+DwmpRenderFlick
+DwmpAllocateSecurityDescriptor
+DwmpFreeSecurityDescriptor
+DwmpEnableDDASupport
DwmGetGraphicsStreamTransformHint
+DwmTetherTextContact
DwmGetTransportAttributes
DwmGetWindowAttribute
+DwmInvalidateIconicBitmaps
DwmIsCompositionEnabled
DwmModifyPreviousDxFrameDuration
DwmQueryThumbnailSourceSize
DwmRegisterThumbnail
+DwmRenderGesture
DwmSetDxFrameDuration
+DwmSetIconicLivePreviewBitmap
+DwmSetIconicThumbnail
DwmSetPresentParameters
DwmSetWindowAttribute
+DwmShowContact
+DwmTetherContact
+DwmTransitionOwnedWindow
DwmUnregisterThumbnail
DwmUpdateThumbnailProperties
-
--- a/mingw-w64-headers/crt/float.h
+++ b/mingw-w64-headers/crt/float.h
@@ -114,6 +114,15 @@
#define DBL_MAX_10_EXP __DBL_MAX_10_EXP__
#define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__
+ /* The difference between 1 and the least value greater than 1 that is
+ representable in the given floating point type, b**1-p. */
+ #undef FLT_EPSILON
+ #undef DBL_EPSILON
+ #undef LDBL_EPSILON
+ #define FLT_EPSILON __FLT_EPSILON__
+ #define DBL_EPSILON __DBL_EPSILON__
+ #define LDBL_EPSILON __LDBL_EPSILON__
+
/* The difference between 1 and the least value greater than 1 that is
representable in the given floating point type, b**1-p. */
#undef FLT_EPSILON

4
src/mingw-w64.mk
Unescape View File

@ -4,8 +4,8 @@ PKG := mingw-w64
$(PKG)_WEBSITE := https://mingw-w64.sourceforge.io/
$(PKG)_DESCR := MinGW-w64 Runtime
$(PKG)_IGNORE :=
$(PKG)_VERSION := 5.0.4
$(PKG)_CHECKSUM := 5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803
$(PKG)_VERSION := 6.0.0
$(PKG)_CHECKSUM := 805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0
$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := https://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)

232
src/openblas-1-fixes.patch
Unescape View File

@ -2,10 +2,240 @@ This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Martin Kroeker <martin@ruby.chemie.uni-freiburg.de>
Date: Thu, 31 May 2018 13:26:00 +0200
Subject: [PATCH 1/2] Work around name clash with Windows10's winnt.h
fixes #1503
https://github.com/xianyi/OpenBLAS/pull/1584/
diff --git a/driver/level3/Makefile b/driver/level3/Makefile
index 1111111..2222222 100644
--- a/driver/level3/Makefile
+++ b/driver/level3/Makefile
@@ -362,7 +362,7 @@ cgemm_ct.$(SUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCT $< -o $(@F)
cgemm_cr.$(SUFFIX) : gemm.c level3.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
cgemm_cc.$(SUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -410,7 +410,7 @@ zgemm_ct.$(SUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCT $< -o $(@F)
zgemm_cr.$(SUFFIX) : gemm.c level3.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
zgemm_cc.$(SUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -458,7 +458,7 @@ xgemm_ct.$(SUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F)
xgemm_cr.$(SUFFIX) : gemm.c level3.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
xgemm_cc.$(SUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -558,7 +558,7 @@ cgemm_thread_ct.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCT $< -o $(@F)
cgemm_thread_cr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
cgemm_thread_cc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -606,7 +606,7 @@ zgemm_thread_ct.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCT $< -o $(@F)
zgemm_thread_cr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
zgemm_thread_cc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -654,7 +654,7 @@ xgemm_thread_ct.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F)
xgemm_thread_cr.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
xgemm_thread_cc.$(SUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -1821,7 +1821,7 @@ cgemm3m_ct.$(SUFFIX) : gemm3m.c gemm3m_level3.c
$(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCT $< -o $(@F)
cgemm3m_cr.$(SUFFIX) : gemm3m.c gemm3m_level3.c
- $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
cgemm3m_cc.$(SUFFIX) : gemm3m.c gemm3m_level3.c
$(CC) $(CFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -1869,7 +1869,7 @@ zgemm3m_ct.$(SUFFIX) : gemm3m.c gemm3m_level3.c
$(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCT $< -o $(@F)
zgemm3m_cr.$(SUFFIX) : gemm3m.c gemm3m_level3.c
- $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
zgemm3m_cc.$(SUFFIX) : gemm3m.c gemm3m_level3.c
$(CC) $(CFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -1917,7 +1917,7 @@ xgemm3m_ct.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F)
xgemm3m_cr.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
xgemm3m_cc.$(SUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -1974,7 +1974,7 @@ cgemm3m_thread_ct.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCT $< -o $(@F)
cgemm3m_thread_cr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
cgemm3m_thread_cc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -2022,7 +2022,7 @@ zgemm3m_thread_ct.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCT $< -o $(@F)
zgemm3m_thread_cr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
zgemm3m_thread_cc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -2070,7 +2070,7 @@ xgemm3m_thread_ct.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F)
xgemm3m_thread_cr.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
- $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
xgemm3m_thread_cc.$(SUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(CFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -2731,7 +2731,7 @@ cgemm_ct.$(PSUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCT $< -o $(@F)
cgemm_cr.$(PSUFFIX) : gemm.c level3.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
cgemm_cc.$(PSUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -2779,7 +2779,7 @@ zgemm_ct.$(PSUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCT $< -o $(@F)
zgemm_cr.$(PSUFFIX) : gemm.c level3.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
zgemm_cc.$(PSUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -2827,7 +2827,7 @@ xgemm_ct.$(PSUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F)
xgemm_cr.$(PSUFFIX) : gemm.c level3.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
xgemm_cc.$(PSUFFIX) : gemm.c level3.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -2927,7 +2927,7 @@ cgemm_thread_ct.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCT $< -o $(@F)
cgemm_thread_cr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
cgemm_thread_cc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -2975,7 +2975,7 @@ zgemm_thread_ct.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCT $< -o $(@F)
zgemm_thread_cr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
zgemm_thread_cc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -3023,7 +3023,7 @@ xgemm_thread_ct.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F)
xgemm_thread_cr.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
xgemm_thread_cc.$(PSUFFIX) : gemm.c level3_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -4190,7 +4190,7 @@ cgemm3m_ct.$(PSUFFIX) : gemm3m.c gemm3m_level3.c
$(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCT $< -o $(@F)
cgemm3m_cr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c
- $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
cgemm3m_cc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c
$(CC) $(PFLAGS) $(BLOCKS) -c -UDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -4238,7 +4238,7 @@ zgemm3m_ct.$(PSUFFIX) : gemm3m.c gemm3m_level3.c
$(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCT $< -o $(@F)
zgemm3m_cr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c
- $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
zgemm3m_cc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c
$(CC) $(PFLAGS) $(BLOCKS) -c -DDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -4286,7 +4286,7 @@ xgemm3m_ct.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F)
xgemm3m_cr.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
xgemm3m_cc.$(PSUFFIX) : gemm3m.c gemm3m_level3.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -4343,7 +4343,7 @@ cgemm3m_thread_ct.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCT $< -o $(@F)
cgemm3m_thread_cr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
cgemm3m_thread_cc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -UDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -4391,7 +4391,7 @@ zgemm3m_thread_ct.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCT $< -o $(@F)
zgemm3m_thread_cr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
zgemm3m_thread_cc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DDOUBLE -DCOMPLEX -DCC $< -o $(@F)
@@ -4439,7 +4439,7 @@ xgemm3m_thread_ct.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCT $< -o $(@F)
xgemm3m_thread_cr.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
- $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR $< -o $(@F)
+ $(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCR=CR $< -o $(@F)
xgemm3m_thread_cc.$(PSUFFIX) : gemm3m.c level3_gemm3m_thread.c ../../param.h
$(CC) $(PFLAGS) $(BLOCKS) -c -DTHREADED_LEVEL3 -DXDOUBLE -DCOMPLEX -DCC $< -o $(@F)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Mon, 20 Nov 2017 16:20:03 +1100
Subject: [PATCH 1/1] ARCH from openblas build conflicts with lapack
Subject: [PATCH 2/2] ARCH from openblas build conflicts with lapack
diff --git a/Makefile b/Makefile

8
src/plibc.mk
Unescape View File

@ -13,7 +13,13 @@ define $(PKG)_BUILD
cd '$(SOURCE_DIR)' && autoreconf -fi
cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \
$(MXE_CONFIGURE_OPTS) \
--includedir='$(PREFIX)/$(TARGET)/include/plibc'
--includedir='$(PREFIX)/$(TARGET)/include/plibc' \
CFLAGS='-DEHOSTDOWN=WSAEHOSTDOWN \
-DESOCKTNOSUPPORT=WSAESOCKTNOSUPPORT \
-DEPROCLIM=WSAEPROCLIM \
-DEDQUOT=WSAEDQUOT \
-DESTALE=WSAESTALE \
-DECASECLASH=2137'
$(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
$(MAKE) -C '$(BUILD_DIR)' -j 1 install

100
src/poco-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 16:52:55 -0700
Subject: [PATCH 1/3] configure: Define POCO_STATIC when --static is requested
Subject: [PATCH 1/6] configure: Define POCO_STATIC when --static is requested
diff --git a/configure b/configure
@ -24,7 +24,7 @@ index 1111111..2222222 100755
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 17:09:19 -0700
Subject: [PATCH 2/3] Config.h: Add prototype for POCO_STATIC
Subject: [PATCH 2/6] Config.h: Add prototype for POCO_STATIC
diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h
@ -46,7 +46,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Mon, 8 Sep 2014 16:27:42 -0700
Subject: [PATCH 3/3] Types.h: Fix Win64 on MinGW
Subject: [PATCH 3/6] Types.h: Fix Win64 on MinGW
diff --git a/Foundation/include/Poco/Types.h b/Foundation/include/Poco/Types.h
@ -85,3 +85,97 @@ index 1111111..2222222 100644
#endif
#define POCO_HAVE_INT64 1
#elif defined(__DECCXX)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 16 Nov 2014 09:14:22 -0800
Subject: [PATCH 4/6] Environment: Fix winsock2.h include
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/Foundation/src/Environment_WIN32.cpp b/Foundation/src/Environment_WIN32.cpp
index 1111111..2222222 100644
--- a/Foundation/src/Environment_WIN32.cpp
+++ b/Foundation/src/Environment_WIN32.cpp
@@ -39,6 +39,7 @@
#include <sstream>
#include <cstring>
#include "Poco/UnWindows.h"
+#include <winsock2.h>
#include <iphlpapi.h>
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 17 Sep 2018 16:56:11 +0200
Subject: [PATCH 5/6] build fix related to pcre
diff --git a/Foundation/include/Poco/RegularExpression.h b/Foundation/include/Poco/RegularExpression.h
index 1111111..2222222 100644
--- a/Foundation/include/Poco/RegularExpression.h
+++ b/Foundation/include/Poco/RegularExpression.h
@@ -47,6 +47,9 @@
#include <vector>
+#if defined(POCO_UNBUNDLED)
+#include <pcre.h>
+#else
//
// Copy these definitions from pcre.h
// to avoid pulling in the entire header file
@@ -57,7 +60,7 @@ extern "C"
typedef struct real_pcre pcre;
struct pcre_extra;
}
-
+#endif
namespace Poco {
diff --git a/Foundation/src/RegularExpression.cpp b/Foundation/src/RegularExpression.cpp
index 1111111..2222222 100644
--- a/Foundation/src/RegularExpression.cpp
+++ b/Foundation/src/RegularExpression.cpp
@@ -37,9 +37,7 @@
#include "Poco/RegularExpression.h"
#include "Poco/Exception.h"
#include <sstream>
-#if defined(POCO_UNBUNDLED)
-#include <pcre.h>
-#else
+#ifndef POCO_UNBUNDLED
#include "pcre.h"
#endif
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 17 Sep 2018 17:05:03 +0200
Subject: [PATCH 6/6] drop obsolete -mno-cygwin
diff --git a/build/config/MinGW-CrossEnv b/build/config/MinGW-CrossEnv
index 1111111..2222222 100644
--- a/build/config/MinGW-CrossEnv
+++ b/build/config/MinGW-CrossEnv
@@ -23,7 +23,7 @@ CXX = $(CROSSENV)-g++
LINK = $(CXX)
LIB = $(CROSSENV)-ar -cr
RANLIB = $(CROSSENV)-ranlib
-SHLIB = $(CXX) -shared -mno-cygwin -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
+SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP =
DEP = $(POCO_BASE)/build/script/makedepend.gcc
@@ -68,7 +68,7 @@ RELEASEOPT_LINK = -O2
#
# System Specific Flags
#
-SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED
+SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED
#
# System Specific Libraries

22
src/poco-2-fix-mno-cygwin.patch
Unescape View File

@ -1,22 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
--- a/build/config/MinGW-CrossEnv
+++ b/build/config/MinGW-CrossEnv
@@ -23,7 +23,7 @@ CXX = $(CROSSENV)-g++
LINK = $(CXX)
LIB = $(CROSSENV)-ar -cr
RANLIB = $(CROSSENV)-ranlib
-SHLIB = $(CXX) -shared -mno-cygwin -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
+SHLIB = $(CXX) -shared -o $@ -Wl,--out-implib=$(dir $@)$(subst cyg,lib,$(basename $(notdir $@))).a
SHLIBLN = $(POCO_BASE)/build/script/shlibln
STRIP =
DEP = $(POCO_BASE)/build/script/makedepend.gcc
@@ -68,7 +68,7 @@ RELEASEOPT_LINK = -O2
#
# System Specific Flags
#
-SYSFLAGS = -mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED
+SYSFLAGS = -D_WIN32 -DMINGW32 -DWINVER=0x500 -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED
#
# System Specific Libraries

24
src/poco-3-winsock2.patch
Unescape View File

@ -1,24 +0,0 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 25b2fc9af331fe6add75fb108bec590f8d467b20 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 16 Nov 2014 09:14:22 -0800
Subject: [PATCH] Environment: Fix winsock2.h include
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/Foundation/src/Environment_WIN32.cpp b/Foundation/src/Environment_WIN32.cpp
index 9443c32..e251da1 100644
--- a/Foundation/src/Environment_WIN32.cpp
+++ b/Foundation/src/Environment_WIN32.cpp
@@ -39,6 +39,7 @@
#include <sstream>
#include <cstring>
#include "Poco/UnWindows.h"
+#include <winsock2.h>
#include <iphlpapi.h>
--
1.9.1

30
src/qtmultimedia-1-fixes.patch
Unescape View File

@ -0,0 +1,30 @@
This file is part of MXE. See LICENSE.md for licensing information.
Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 17 Sep 2018 12:38:35 +0200
Subject: [PATCH 1/1] mingw-w64 6 fix
diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h
index 1111111..2222222 100644
--- a/src/plugins/common/evr/evrdefs.h
+++ b/src/plugins/common/evr/evrdefs.h
@@ -83,6 +83,7 @@ HRESULT WINAPI Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex**);
#define MF_E_TRANSFORM_NEED_MORE_INPUT ((HRESULT)0xC00D6D72L)
#endif
+#if __MINGW64_VERSION_MAJOR < 6
#ifdef __GNUC__
typedef struct MFVideoNormalizedRect {
float left;
@@ -91,6 +92,7 @@ typedef struct MFVideoNormalizedRect {
float bottom;
} MFVideoNormalizedRect;
#endif
+#endif
#include <initguid.h>

4
src/qtmultimedia.mk
Unescape View File

@ -16,7 +16,9 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' \
-after \
'LIBS_PRIVATE += -lamstrmid'
$(MAKE) -C '$(1)' -j '$(JOBS)'
$(MAKE) -C '$(1)' -j 1 install
endef

11
src/widl-1-fixes.patch
Unescape View File

@ -9,15 +9,18 @@ Subject: [PATCH 1/1] fixes
diff --git a/mingw-w64-tools/widl/include/windef.h b/mingw-w64-tools/widl/include/windef.h
index 1111111..2222222 100644
index 8e8a08a..3d50e13 100644
--- a/mingw-w64-tools/widl/include/windef.h
+++ b/mingw-w64-tools/widl/include/windef.h
@@ -85,7 +85,7 @@ extern "C" {
@@ -101,7 +101,7 @@ extern "C" {
#endif /* __cdecl */
#ifndef __ms_va_list
-# if defined(__x86_64__) && defined (__GNUC__)
+# if defined(__x86_64__) && defined (__GNUC__) && defined(__builtin_ms_va_list)
-# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__)
+# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) && defined(__builtin_ms_va_list)
# define __ms_va_list __builtin_ms_va_list
# define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
# define __ms_va_end(list) __builtin_ms_va_end(list)
--
2.17.1

23
src/wt-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sat, 1 Apr 2017 15:17:43 +0200
Subject: [PATCH 1/2] Wt fixes
Subject: [PATCH 1/3] Wt fixes
diff --git a/cmake/WtFindBoost-vintage.txt b/cmake/WtFindBoost-vintage.txt
@ -86,7 +86,7 @@ index 1111111..2222222 100644
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 15 Aug 2018 13:28:31 +1000
Subject: [PATCH 2/2] fix w32 build posix threads enabled
Subject: [PATCH 2/3] fix w32 build posix threads enabled
diff --git a/src/http/Reply.C b/src/http/Reply.C
@ -102,3 +102,22 @@ index 1111111..2222222 100644
// gmtime_r can be defined by mingw
#ifndef gmtime_r
static struct tm* gmtime_r(const time_t* t, struct tm* r)
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 17 Sep 2018 23:31:42 +0200
Subject: [PATCH 3/3] fix missing gmtime_r definition
diff --git a/src/http/Reply.C b/src/http/Reply.C
index 1111111..2222222 100644
--- a/src/http/Reply.C
+++ b/src/http/Reply.C
@@ -13,6 +13,7 @@
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
+#include <unistd.h>
#include "Configuration.h"
#include "Connection.h"
#include "Reply.h"

53
src/zip-1-fixes.patch
Unescape View File

@ -5,7 +5,7 @@ Contains ad hoc patches for cross building.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 27 Feb 2018 16:22:41 +0100
Subject: [PATCH 1/1] MXE build fixes
Subject: [PATCH 1/2] MXE build fixes
diff --git a/win32/makefile.gcc b/win32/makefile.gcc
@ -42,3 +42,54 @@ index 1111111..2222222 100644
# if (defined(__MINGW32__) && !defined(MB_CUR_MAX))
# ifdef __MSVCRT__
IZ_IMP extern int *__p___mb_cur_max(void);
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 17 Sep 2018 22:10:32 +0200
Subject: [PATCH 2/2] avoid define clash on CR
diff --git a/zip.h b/zip.h
index 1111111..2222222 100644
--- a/zip.h
+++ b/zip.h
@@ -262,7 +262,7 @@ struct plist {
/* ASCII definitions for line terminators in text files: */
#define LF 10 /* '\n' on ASCII machines; must be 10 due to EBCDIC */
-#define CR 13 /* '\r' on ASCII machines; must be 13 due to EBCDIC */
+#define ZIPCR 13 /* '\r' on ASCII machines; must be 13 due to EBCDIC */
#define CTRLZ 26 /* DOS & OS/2 EOF marker (used in fileio.c, vms.c) */
/* return codes of password fetches (negative: user abort; positive: error) */
diff --git a/zipup.c b/zipup.c
index 1111111..2222222 100644
--- a/zipup.c
+++ b/zipup.c
@@ -1207,7 +1207,7 @@ local unsigned file_read(buf, size)
char c;
if ((c = *b++) == '\n') {
- *buf++ = CR; *buf++ = LF; len++;
+ *buf++ = ZIPCR; *buf++ = LF; len++;
} else {
*buf++ = (char)ascii[(uch)c];
}
@@ -1217,7 +1217,7 @@ local unsigned file_read(buf, size)
#endif /* EBCDIC */
{
do {
- if ((*buf++ = *b++) == '\n') *(buf-1) = CR, *buf++ = LF, len++;
+ if ((*buf++ = *b++) == '\n') *(buf-1) = ZIPCR, *buf++ = LF, len++;
} while (--size != 0);
}
buf -= len;
@@ -1257,7 +1257,7 @@ local unsigned file_read(buf, size)
#endif /* EBCDIC */
{
do {
- if (( *buf++ = *b++) == CR && *b == LF) buf--, len--;
+ if (( *buf++ = *b++) == ZIPCR && *b == LF) buf--, len--;
} while (--size != 0);
}
if (len == 0) {

Write Preview
Loading…
Cancel
Save