Mercurial > mxe-octave

changeset 5761:c366dab2350c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mingw-w64: update to v8.0.2 * dist-files: add ref to libgomp-1-fixes.patch, mingw-pkg-config-1-gnu-printf.patch * src/libgomp-1-fixes.patch, src/mingw-pkg-config-1-gnu-printf.patch: new files for mingw-w64 update * src/mingw-w64-1-float-h.patch: update patch * src/mingw-w64.mk: update version, checksum
author John Donoghue <john.donoghue@ieee.org>
date Wed, 26 May 2021 08:18:17 -0400
parents baeb0900fdf7
children fbb7e0cb84c6
files dist-files.mk src/libgomp-1-fixes.patch src/mingw-pkg-config-1-gnu-printf.patch src/mingw-w64-1-float-h.patch src/mingw-w64.mk
diffstat 5 files changed, 134 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu May 13 17:23:00 2021 +0200
+++ b/dist-files.mk	Wed May 26 08:18:17 2021 -0400
@@ -247,6 +247,7 @@
   libglade.mk \
   libgnurx-1-build-static-lib.patch \
   libgnurx.mk \
+  libgomp-1-fixes.patch \
   libgomp-test.c \
   libgomp.mk \
   libgpg_error-1-fixes.patch \
@@ -347,6 +348,7 @@
   mingw-libgcrypt-1-fixes.patch \
   mingw-libmng-1-noundefines.patch \
   mingw-openblas-1-xerbla.patch \
+  mingw-pkg-config-1-gnu-printf.patch \
   mingw-portaudio-1-pkgconfig.patch \
   mingw-s2tc-1-fixes.patch \
   mingw-texinfo-1-fixes.patch \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgomp-1-fixes.patch	Wed May 26 08:18:17 2021 -0400
@@ -0,0 +1,41 @@
+diff -ur gcc-10.2.0.orig/libgomp/libgomp.h gcc-10.2.0/libgomp/libgomp.h
+--- gcc-10.2.0.orig/libgomp/libgomp.h	2021-05-12 11:35:02.852122961 -0400
++++ gcc-10.2.0/libgomp/libgomp.h	2021-05-12 11:37:05.593912873 -0400
+@@ -69,6 +69,14 @@
+ # endif
+ #endif
+ 
++#include <stdio.h>
++#include <stdio.h>
++#ifdef __MINGW_PRINTF_FORMAT
++#define PRINTF_FORMAT __MINGW_PRINTF_FORMAT
++#else
++#define PRINTF_FORMAT printf
++#endif
++
+ #ifdef HAVE_ATTRIBUTE_VISIBILITY
+ # pragma GCC visibility push(hidden)
+ #endif
+@@ -173,7 +181,7 @@
+ 
+ extern void gomp_vdebug (int, const char *, va_list);
+ extern void gomp_debug (int, const char *, ...)
+-	__attribute__ ((format (printf, 2, 3)));
++	__attribute__ ((format (PRINTF_FORMAT, 2, 3)));
+ #define gomp_vdebug(KIND, FMT, VALIST) \
+   do { \
+     if (__builtin_expect (gomp_debug_var, 0)) \
+@@ -186,11 +194,11 @@
+   } while (0)
+ extern void gomp_verror (const char *, va_list);
+ extern void gomp_error (const char *, ...)
+-	__attribute__ ((format (printf, 1, 2)));
++	__attribute__ ((format (PRINTF_FORMAT, 1, 2)));
+ extern void gomp_vfatal (const char *, va_list)
+ 	__attribute__ ((noreturn));
+ extern void gomp_fatal (const char *, ...)
+-	__attribute__ ((noreturn, format (printf, 1, 2)));
++	__attribute__ ((noreturn, format (PRINTF_FORMAT, 1, 2)));
+ 
+ struct gomp_task;
+ struct gomp_taskgroup;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mingw-pkg-config-1-gnu-printf.patch	Wed May 26 08:18:17 2021 -0400
@@ -0,0 +1,86 @@
+diff -Naur a/glib/configure.ac b/glib/configure.ac
+--- a/glib/configure.ac	2015-09-21 15:38:33.000000000 +0300
++++ b/glib/configure.ac	2015-09-22 09:09:02.118820700 +0300
+@@ -567,7 +567,7 @@
+ ])
+ fi
+ 
+-AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8], [
++AS_IF([test x$ac_cv_sizeof_long_long = x8], [
+ 	# long long is a 64 bit integer.
+ 	AC_MSG_CHECKING(for format to printf and scanf a guint64)
+ 	AC_CACHE_VAL(glib_cv_long_long_format,[
+@@ -589,8 +589,8 @@
+ 	AS_IF([ test -n "$glib_cv_long_long_format"], [
+ 	  AC_MSG_RESULT(%${glib_cv_long_long_format}u)
+ 	  AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long])
+-	  if test x"$glib_cv_long_long_format" = xI64; then
+-	    AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64])
++	  if test x"$glib_cv_long_long_format" = xll; then
++	    AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format ll])
+           fi
+ 	], [AC_MSG_RESULT(none)])
+ ],[ test x$ac_cv_sizeof___int64 = x8], [
+@@ -3177,8 +3177,8 @@
+   glib_msize_type='LONG'
+   ;;
+ "long long"|__int64)
+-  gsize_modifier='"I64"'
+-  gsize_format='"I64u"'
++  gsize_modifier='"z"'
++  gsize_format='"zu"'
+   glib_msize_type='INT64'
+   ;;
+ esac
+@@ -3200,8 +3200,8 @@
+   glib_mssize_type='LONG'
+   ;;
+ "long long"|__int64)
+-  gssize_modifier='"I64"'
+-  gssize_format='"I64i"'
++  gssize_modifier='"z"'
++  gssize_format='"zi"'
+   glib_mssize_type='INT64'
+   ;;
+ esac
+@@ -3230,9 +3230,9 @@
+   ;;
+ $ac_cv_sizeof_long_long)
+   glib_intptr_type_define='long long'
+-  gintptr_modifier='"I64"'
+-  gintptr_format='"I64i"'
+-  guintptr_format='"I64u"'
++  gintptr_modifier='"ll"'
++  gintptr_format='"lli"'
++  guintptr_format='"llu"'
+   glib_gpi_cast='(gint64)'
+   glib_gpui_cast='(guint64)'
+   ;;
+diff -Naur a/glib/glib/gmacros.h b/glib/glib/gmacros.h
+--- a/glib/glib/gmacros.h	2015-08-19 06:35:30.000000000 +0300
++++ b/glib/glib/gmacros.h	2015-09-22 09:09:02.118820700 +0300
+@@ -79,9 +79,9 @@
+ 
+ #if     __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+ #define G_GNUC_PRINTF( format_idx, arg_idx )    \
+-  __attribute__((__format__ (__printf__, format_idx, arg_idx)))
++  __attribute__((__format__ (gnu_printf, format_idx, arg_idx)))
+ #define G_GNUC_SCANF( format_idx, arg_idx )     \
+-  __attribute__((__format__ (__scanf__, format_idx, arg_idx)))
++  __attribute__((__format__ (gnu_scanf, format_idx, arg_idx)))
+ #define G_GNUC_FORMAT( arg_idx )                \
+   __attribute__((__format_arg__ (arg_idx)))
+ #define G_GNUC_NORETURN                         \
+diff -Naur a/glib/glib/gpoll.h b/glib/glib/gpoll.h
+--- a/glib/glib/gpoll.h	2014-12-20 00:49:48.000000000 +0300
++++ b/glib/glib/gpoll.h	2015-09-22 09:09:02.118820700 +0300
+@@ -108,7 +108,7 @@
+  */
+ #ifdef G_OS_WIN32
+ #if GLIB_SIZEOF_VOID_P == 8
+-#define G_POLLFD_FORMAT "%#I64x"
++#define G_POLLFD_FORMAT "%#llx"
+ #else
+ #define G_POLLFD_FORMAT "%#x"
+ #endif
+
--- a/src/mingw-w64-1-float-h.patch	Thu May 13 17:23:00 2021 +0200
+++ b/src/mingw-w64-1-float-h.patch	Wed May 26 08:18:17 2021 -0400
@@ -1,9 +1,11 @@
 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: Sun, 29 Mar 2015 14:36:38 +0200
-Subject: [PATCH 1/2] workaround for -isystem flag messing up include order
+Subject: [PATCH 1/1] workaround for -isystem flag messing up include order
 
 https://bugzilla.redhat.com/show_bug.cgi?id=843436
 
@@ -27,35 +29,3 @@
  	/* Addition rounds to 0: zero, 1: nearest, 2: +inf, 3: -inf, -1: unknown.  */
  	/* ??? This is supposed to change with calls to fesetround in <fenv.h>.  */
  	#undef FLT_ROUNDS
-
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jonathan Yong <10walls@gmail.com>
-Date: Fri, 22 Dec 2017 13:01:03 +0000
-Subject: [PATCH 2/2] dwmapi.def: Regenegerate from Windows 10
-
-Remove ordinals from x86 library too.
-
-Signed-off-by: Jonathan Yong <10walls@gmail.com>
-
-Taken from: https://sourceforge.net/p/mingw-w64/mailman/message/36166386/
-
-diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
-index 1111111..2222222 100644
---- 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
--- a/src/mingw-w64.mk	Thu May 13 17:23:00 2021 +0200
+++ b/src/mingw-w64.mk	Wed May 26 08:18:17 2021 -0400
@@ -3,8 +3,8 @@
 
 PKG             := mingw-w64
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 7.0.0
-$(PKG)_CHECKSUM := 25940043c4541e3e59608dead9b6f75b5596d606
+$(PKG)_VERSION  := 8.0.2
+$(PKG)_CHECKSUM := 14f9b61f2adb827bde25f531531a11fb8eb7c53e
 $(PKG)_SUBDIR   := $(PKG)-v$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-v$($(PKG)_VERSION).tar.bz2
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE)