X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fmxe_fixes.patch;h=72a4dd00219623c32079aa6d30df580e37307c3d;hp=0b7700da082e89b9c40d5eaae6c41cb63e77fa6a;hb=HEAD;hpb=71643bae058d8fdf158349cb0bafe712cc9f5f40

diff --git a/cross-compile/mingw/mxe_fixes.patch b/cross-compile/mingw/mxe_fixes.patch
index 0b7700d..b62d513 100644
--- a/cross-compile/mingw/mxe_fixes.patch
+++ b/cross-compile/mingw/mxe_fixes.patch
@@ -1,8 +1,15 @@
+Implementor's note: These patches currently (2022-11) don't apply to
+recent MXE, their context has changed. The patches' motivation might
+have become obsolete, too. This needs reconsideration. When in doubt,
+attempt to build with an MXE toolchain which omits these "MXE fixes"
+(which actually are downgrades of tools and libraries, while mainline
+MXE has upgraded and could have fixed previous issues). Older notes
+from a previous implementation follow below.
+
+
 These patches are currently required to get a properly working
 MXE setup for sigrok usage.
 
- - libsigrok currently requires a special libusb branch.
-
  - We're reverting to glib 2.44.1 for now since more recent
    versions (e.g. 2.50.2) seem to have a bug. Details:
    https://sigrok.org/bugzilla/show_bug.cgi?id=1232
@@ -12,36 +19,187 @@ MXE setup for sigrok usage.
    https://sigrok.org/bugzilla/show_bug.cgi?id=986
    https://gitlab.gnome.org/GNOME/glib/commit/3d7cde654c4c6f3bdad32f5521f28f5802a7c377
 
-diff --git a/src/libusb1.mk b/src/libusb1.mk
-index ab01bf69..53aed36e 100644
---- a/src/libusb1.mk
-+++ b/src/libusb1.mk
-@@ -4,11 +4,11 @@ PKG             := libusb1
- $(PKG)_WEBSITE  := https://libusb.info/
- $(PKG)_DESCR    := LibUsb-1.0
- $(PKG)_IGNORE   :=
--$(PKG)_VERSION  := 1.0.23
--$(PKG)_CHECKSUM := 4fc17b2ef3502757641bf8fe2c14ad86ec86302a2b785abcb0806fd03aa1201f
--$(PKG)_SUBDIR   := libusb-$($(PKG)_VERSION)
--$(PKG)_FILE     := libusb-$($(PKG)_VERSION).tar.bz2
--$(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/libusb/libusb-1.0/libusb-$($(PKG)_VERSION)/$($(PKG)_FILE)
-+$(PKG)_VERSION  := 1.0.20-rc3-event-abstraction-v4
-+$(PKG)_CHECKSUM := 58fee7f3f05fda209d14c55763df36ab86028bd9ab82c9bb74f1d5ab3208bcfd
-+$(PKG)_SUBDIR   := libusb-event-abstraction-v4
-+$(PKG)_FILE     := libusb-event-abstraction-v4.zip
-+$(PKG)_URL      := https://github.com/dickens/libusb/archive/event-abstraction-v4.zip
- $(PKG)_DEPS     := cc
- 
- define $(PKG)_UPDATE
-@@ -19,7 +19,7 @@ define $(PKG)_UPDATE
- endef
- 
- define $(PKG)_BUILD
--    cd '$(1)' && ./configure \
-+    cd '$(1)' && autoreconf -i && ./configure \
-         $(MXE_CONFIGURE_OPTS) \
-         CFLAGS=-D_WIN32_WINNT=0x0500
-     $(MAKE) -C '$(1)' -j '$(JOBS)' install
+ - Bump MXE's binutils to version 2.35, which added -mbig-obj support
+   for 32bit Windows (64bit was supported already). Required for PulseView.
+
+See the other file for a libusb discussion.
+
+
+Change from binutils 2.28 to 2.35.
+
+diff --git a/src/binutils-1-fixes.patch b/src/binutils-1-fixes.patch
+deleted file mode 100644
+index 357428fe..00000000
+--- a/src/binutils-1-fixes.patch
++++ /dev/null
+@@ -1,147 +0,0 @@
+-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: Stephen Kitt <skitt@debian.org>
+-Date: Sat, 15 Jul 2017 00:09:40 +1000
+-Subject: [PATCH 1/1] Allow the PE timestamp to be specified with
+- SOURCE_DATE_EPOCH
+-
+-Taken from:
+-https://sources.debian.net/patches/binutils-mingw-w64/7.4/specify-timestamp.patch/
+-
+-diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c
+-index 1111111..2222222 100644
+---- a/bfd/peXXigen.c
+-+++ b/bfd/peXXigen.c
+-@@ -70,6 +70,9 @@
+- #include <wctype.h>
+- #endif
+- 
+-+#include <errno.h>
+-+#include <limits.h>
+-+
+- /* NOTE: it's strange to be including an architecture specific header
+-    in what's supposed to be general (to PE/PEI) code.  However, that's
+-    where the definitions are, and they don't vary per architecture
+-@@ -878,10 +881,38 @@ _bfd_XXi_only_swap_filehdr_out (bfd * abfd, void * in, void * out)
+-   H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns);
+- 
+-   /* Only use a real timestamp if the option was chosen.  */
+--  if ((pe_data (abfd)->insert_timestamp))
+--    H_PUT_32 (abfd, time (0), filehdr_out->f_timdat);
+--  else
+-+  if (pe_data (abfd)->insert_timestamp) {
+-+    time_t now;
+-+    char *source_date_epoch;
+-+    unsigned long long epoch;
+-+    char *endptr;
+-+
+-+    now = time(NULL);
+-+    source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+-+    if (source_date_epoch) {
+-+      errno = 0;
+-+      epoch = strtoull(source_date_epoch, &endptr, 10);
+-+      if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
+-+          || (errno != 0 && epoch == 0)) {
+-+        _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n",
+-+                           strerror(errno));
+-+      } else if (endptr == source_date_epoch) {
+-+        _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n",
+-+                           endptr);
+-+      } else if (*endptr != '\0') {
+-+        _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n",
+-+                           endptr);
+-+      } else if (epoch > ULONG_MAX) {
+-+        _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n",
+-+                           ULONG_MAX, epoch);
+-+      } else {
+-+        now = epoch;
+-+      }
+-+    }
+-+    H_PUT_32 (abfd, now, filehdr_out->f_timdat);
+-+  } else {
+-     H_PUT_32 (abfd, 0, filehdr_out->f_timdat);
+-+  }
+- 
+-   PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr,
+- 		      filehdr_out->f_symptr);
+-diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
+-index 1111111..2222222 100644
+---- a/ld/emultempl/pe.em
+-+++ b/ld/emultempl/pe.em
+-@@ -305,7 +305,7 @@ gld${EMULATION_NAME}_add_options
+-      OPTION_USE_NUL_PREFIXED_IMPORT_TABLES},
+-     {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE},
+-     {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE},
+--    {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP},
+-+    {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP},
+-     {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP},
+- #ifdef DLL_SUPPORT
+-     /* getopt allows abbreviations, so we do this to stop it
+-diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
+-index 1111111..2222222 100644
+---- a/ld/emultempl/pep.em
+-+++ b/ld/emultempl/pep.em
+-@@ -321,7 +321,7 @@ gld${EMULATION_NAME}_add_options
+-     {"no-bind", no_argument, NULL, OPTION_NO_BIND},
+-     {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER},
+-     {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE},
+--    {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP},
+-+    {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP},
+-     {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP},
+-     {"build-id", optional_argument, NULL, OPTION_BUILD_ID},
+-     {NULL, no_argument, NULL, 0}
+-diff --git a/ld/pe-dll.c b/ld/pe-dll.c
+-index 1111111..2222222 100644
+---- a/ld/pe-dll.c
+-+++ b/ld/pe-dll.c
+-@@ -26,6 +26,8 @@
+- #include "filenames.h"
+- #include "safe-ctype.h"
+- 
+-+#include <errno.h>
+-+#include <limits.h>
+- #include <time.h>
+- 
+- #include "ld.h"
+-@@ -1192,8 +1194,36 @@ fill_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED)
+- 
+-   memset (edata_d, 0, edata_sz);
+- 
+--  if (pe_data (abfd)->insert_timestamp)
+--    H_PUT_32 (abfd, time (0), edata_d + 4);
+-+  if (pe_data (abfd)->insert_timestamp) {
+-+    time_t now;
+-+    char *source_date_epoch;
+-+    unsigned long long epoch;
+-+    char *endptr;
+-+
+-+    now = time(NULL);
+-+    source_date_epoch = getenv("SOURCE_DATE_EPOCH");
+-+    if (source_date_epoch) {
+-+      errno = 0;
+-+      epoch = strtoull(source_date_epoch, &endptr, 10);
+-+      if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
+-+	  || (errno != 0 && epoch == 0)) {
+-+	einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n",
+-+	      strerror(errno));
+-+      } else if (endptr == source_date_epoch) {
+-+	einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n",
+-+	      endptr);
+-+      } else if (*endptr != '\0') {
+-+	einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n",
+-+	      endptr);
+-+      } else if (epoch > ULONG_MAX) {
+-+	einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n",
+-+	      ULONG_MAX, epoch);
+-+      } else {
+-+	now = epoch;
+-+      }
+-+    }
+-+    H_PUT_32 (abfd, now, edata_d + 4);
+-+  }
+- 
+-   if (pe_def_file->version_major != -1)
+-     {
+
+diff --git a/src/binutils.mk b/src/binutils.mk
+index 9721b581..8eab8bf3 100644
+--- a/src/binutils.mk
++++ b/src/binutils.mk
+@@ -3,8 +3,8 @@
+ PKG             := binutils
+ $(PKG)_WEBSITE  := https://www.gnu.org/software/binutils/
+ $(PKG)_DESCR    := GNU Binutils
+-$(PKG)_VERSION  := 2.28
+-$(PKG)_CHECKSUM := 6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72
++$(PKG)_VERSION  := 2.35
++$(PKG)_CHECKSUM := 7d24660f87093670738e58bcc7b7b06f121c0fcb0ca8fc44368d675a5ef9cff7
+ $(PKG)_SUBDIR   := binutils-$($(PKG)_VERSION)
+ $(PKG)_FILE     := binutils-$($(PKG)_VERSION).tar.bz2
+ $(PKG)_URL      := https://ftp.gnu.org/gnu/binutils/$($(PKG)_FILE)
+
+
+Provide glib fixing patches. As well as downgrade to 2.44.1.
+
 diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch
 index 764ece9e..428cc6a9 100644
 --- a/src/glib-1-fixes.patch
@@ -353,6 +511,7 @@ index 764ece9e..428cc6a9 100644
 -         {
 -           g_set_error (error,
 -                        G_IO_ERROR,
+
 diff --git a/src/glib-2-format.patch b/src/glib-2-format.patch
 new file mode 100644
 index 00000000..3d594af0
@@ -436,6 +595,7 @@ index 00000000..3d594af0
 +   glib_gpi_cast='(gint64)'
 +   glib_gpui_cast='(guint64)'
 +   ;;
+
 diff --git a/src/glib.mk b/src/glib.mk
 index 825b86bb..499a45b8 100644
 --- a/src/glib.mk
@@ -457,7 +617,7 @@ index 825b86bb..499a45b8 100644
      cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
          $(MXE_CONFIGURE_OPTS) \
          --enable-regex \
-+	--disable-compile-warnings \
++        --disable-compile-warnings \
          --disable-threads \
          --disable-selinux \
          --disable-inotify \
@@ -465,7 +625,7 @@ index 825b86bb..499a45b8 100644
      cd '$(SOURCE_DIR)' && NOCONFIGURE=true ./autogen.sh
      cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
          $(MXE_CONFIGURE_OPTS) \
-+	--disable-compile-warnings \
++        --disable-compile-warnings \
          --enable-regex \
          --disable-threads \
          --disable-selinux \
@@ -473,7 +633,7 @@ index 825b86bb..499a45b8 100644
      cd '$(SOURCE_DIR)' && NOCONFIGURE=true ./autogen.sh
      cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
          $(MXE_CONFIGURE_OPTS) \
-+	--disable-compile-warnings \
++        --disable-compile-warnings \
          --with-threads=win32 \
          --with-pcre=system \
          --with-libiconv=gnu \