diff --git a/README.md b/README.md index c175d389..187e74d2 100644 --- a/README.md +++ b/README.md @@ -21,11 +21,11 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. | [cairo] | 1.17.4 | Mozilla Public License 2.0 | | [expat] | 2.4.1 | MIT Licence | | [fontconfig] | 2.13.94 | [fontconfig Licence] (BSD-like) | -| [freetype] | 2.10.4 | [freetype Licence] (BSD-like) | +| [freetype] | 2.11.0 | [freetype Licence] (BSD-like) | | [fribidi] | 1.0.10 | LGPLv3 | | [gdk-pixbuf] | 2.42.6 | LGPLv3 | -| [glib] | 2.69.1 | LGPLv3 | -| [harfbuzz] | 2.8.2 | MIT Licence | +| [glib] | 2.69.2 | LGPLv3 | +| [harfbuzz] | 2.9.0 | MIT Licence | | [lcms] | 2.12 | MIT Licence | | [libexif] | 0.6.22 | LGPLv3 | | [libffi] | 3.4.2 | MIT Licence | @@ -41,7 +41,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. | [libxml2] | 2.9.12 | MIT Licence | | [mozjpeg] | 4.0.3 | [zlib License, IJG License, BSD-3-Clause] | | [orc] | 0.4.32 | [orc License] (BSD-like) | -| [pango] | 1.48.8 | LGPLv3 | +| [pango] | 1.49.1 | LGPLv3 | | [pixman] | 0.40.0 | MIT Licence | | [zlib-ng] | 2.0.5 | [zlib-ng Licence] | @@ -53,8 +53,8 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help. [expat]: https://github.com/libexpat/libexpat [fontconfig]: https://gitlab.freedesktop.org/fontconfig/fontconfig [fontconfig Licence]: https://gitlab.freedesktop.org/fontconfig/fontconfig/blob/master/COPYING -[freetype]: https://git.savannah.gnu.org/cgit/freetype/freetype2.git -[freetype Licence]: https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT +[freetype]: https://gitlab.freedesktop.org/freetype/freetype +[freetype Licence]: https://gitlab.freedesktop.org/freetype/freetype/blob/master/docs/FTL.TXT [fribidi]: https://github.com/fribidi/fribidi [gdk-pixbuf]: https://gitlab.gnome.org/GNOME/gdk-pixbuf [glib]: https://gitlab.gnome.org/GNOME/glib @@ -93,7 +93,7 @@ Same as libvips-web + these extra dependencies: | [cfitsio] | 4.0.0 | BSD-like | | [fftw] | 3.3.9 | GPLv2 | | [highway] | 0.14.0 | Apache-2.0 License | -| [imagemagick] | 6.9.12-19 | [ImageMagick License] (Apache-2.0-like) | +| [imagemagick] | 6.9.12-20 | [ImageMagick License] (Apache-2.0-like) | | [imath] | 3.1.2 | BSD 3-Clause | | [libjxl] | 0.5 | BSD 3-Clause | | [matio] | 1.5.21 | BSD 2-Clause | @@ -101,7 +101,7 @@ Same as libvips-web + these extra dependencies: | [openexr] | 3.1.1 | BSD 3-Clause | | [openjpeg] | 2.4.0 | BSD 2-Clause | | [openslide] | 3.4.1 | LGPLv3 | -| [poppler] | 21.08.0 | GPLv2 | +| [poppler] | 21.09.0 | GPLv2 | | [sqlite] | 3.36.0 | Public domain | [brotli]: https://github.com/google/brotli diff --git a/build/build.sh b/build/build.sh index 5cf66f5d..b24201ca 100755 --- a/build/build.sh +++ b/build/build.sh @@ -51,7 +51,7 @@ fi # Always checkout a particular revision which will successfully build. # This ensures that it will not suddenly break a build. # Note: Must be regularly updated. -revision="99d62e454ce805b03aaddcdb6cd209cada503543" +revision="74dd24ca82a5e48ccaf0b549eaef1db07ed382ad" initialize=false if [ -f "$mxe_dir/Makefile" ]; then diff --git a/build/overrides.mk b/build/overrides.mk index d37f3070..2167031b 100644 --- a/build/overrides.mk +++ b/build/overrides.mk @@ -40,8 +40,8 @@ matio_FILE := matio-$(matio_VERSION).tar.gz matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE) # upstream version is 7, we want ImageMagick 6 -imagemagick_VERSION := 6.9.12-19 -imagemagick_CHECKSUM := 2f184f1f5c3e19849347b2b4acb6dd074290903d36fa5924956ee06c85ddf783 +imagemagick_VERSION := 6.9.12-20 +imagemagick_CHECKSUM := 8fa7addb7eac2dd417c7fbed46ff9dd5614abf7cefea4d786375306bec2659b1 imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch))) imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags @@ -54,8 +54,8 @@ librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz librsvg_URL := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE) # upstream version is 1.37.4 -pango_VERSION := 1.48.8 -pango_CHECKSUM := 009d9d830ecbe11911d6637e48eec1c51390d3d12eb286035ef7c641f3c87410 +pango_VERSION := 1.49.1 +pango_CHECKSUM := c4266dc06c01bf0133d3815502426d209de5ea7abd895899e73e7edebaf48f6f pango_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch))) pango_SUBDIR := pango-$(pango_VERSION) pango_FILE := pango-$(pango_VERSION).tar.xz @@ -71,17 +71,9 @@ fribidi_SUBDIR := fribidi-$(fribidi_VERSION) fribidi_FILE := fribidi-$(fribidi_VERSION).tar.xz fribidi_URL := https://github.com/fribidi/fribidi/releases/download/v$(fribidi_VERSION)/$(fribidi_FILE) -# upstream version is 1.2.0 -libwebp_VERSION := 1.2.1 -libwebp_CHECKSUM := 808b98d2f5b84e9b27fdef6c5372dac769c3bda4502febbfa5031bd3c4d7d018 -libwebp_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libwebp-[0-9]*.patch))) -libwebp_SUBDIR := libwebp-$(libwebp_VERSION) -libwebp_FILE := libwebp-$(libwebp_VERSION).tar.gz -libwebp_URL := http://downloads.webmproject.org/releases/webp/$(libwebp_FILE) - # upstream version is 2.50.2 -glib_VERSION := 2.69.1 -glib_CHECKSUM := f92f34057a091fc8638d91f10cece842cb8618e9a1090b0ddb19cc15a21bf39c +glib_VERSION := 2.69.2 +glib_CHECKSUM := a62249e35a8635175a697b3215f1df2b89e0fbb4adb520dcbe21a3ae1ebb8882 glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch))) glib_SUBDIR := glib-$(glib_VERSION) glib_FILE := glib-$(glib_VERSION).tar.xz @@ -95,15 +87,6 @@ libgsf_SUBDIR := libgsf-$(libgsf_VERSION) libgsf_FILE := libgsf-$(libgsf_VERSION).tar.xz libgsf_URL := https://download.gnome.org/sources/libgsf/$(call SHORT_PKG_VERSION,libgsf)/$(libgsf_FILE) -# Override libjpeg-turbo patch with our own -# upstream version is 2.1.0 -libjpeg-turbo_VERSION := 2.1.1 -libjpeg-turbo_CHECKSUM := b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510 -libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch))) -libjpeg-turbo_SUBDIR := libjpeg-turbo-$(libjpeg-turbo_VERSION) -libjpeg-turbo_FILE := libjpeg-turbo-$(libjpeg-turbo_VERSION).tar.gz -libjpeg-turbo_URL := https://$(SOURCEFORGE_MIRROR)/project/libjpeg-turbo/$(libjpeg-turbo_VERSION)/$(libjpeg-turbo_FILE) - # upstream version is 1.16.0 cairo_VERSION := 1.17.4 cairo_CHECKSUM := 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 @@ -156,8 +139,8 @@ fftw_FILE := fftw-$(fftw_VERSION).tar.gz fftw_URL := http://www.fftw.org/$(fftw_FILE) # upstream version is 21.06.1 -poppler_VERSION := 21.08.0 -poppler_CHECKSUM := e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d +poppler_VERSION := 21.09.0 +poppler_CHECKSUM := 5a47fef738c2b99471f9b459a8bf8b40aefb7eed92caa4861c3798b2e126d05b poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch))) poppler_SUBDIR := poppler-$(poppler_VERSION) poppler_FILE := poppler-$(poppler_VERSION).tar.xz @@ -184,6 +167,9 @@ mingw-w64_URL := https://github.com/mirror/mingw-w64/tarball/$(mingw-w64_VE ## Patches that we override with our own +freetype_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/freetype-[0-9]*.patch))) +freetype-bootstrap_PATCHES := $(freetype_PATCHES) +libjpeg-turbo_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libjpeg-turbo-[0-9]*.patch))) tiff_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/tiff-[0-9]*.patch))) lcms_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/lcms-[0-9]*.patch))) @@ -316,36 +302,27 @@ define harfbuzz_BUILD ninja -C '$(BUILD_DIR)' install endef -# TODO(kleisauke): build with the Meson build system once a new version is available -#define freetype_BUILD_COMMON -# '$(TARGET)-meson' \ -# -Dharfbuzz=enabled \ -# -Dpng=enabled \ -# -Dzlib=enabled \ -# -Dbrotli=disabled \ -# -Dbzip2=disabled \ -# '$(SOURCE_DIR)' \ -# '$(BUILD_DIR)' -# -# ninja -C '$(BUILD_DIR)' install -#endef - -#define freetype-bootstrap_BUILD -# $(subst harfbuzz=enabled,harfbuzz=disabled,$(freetype_BUILD_COMMON)) -#endef +# build with the Meson build system +# build without bzip2 and brotli +define freetype_BUILD_COMMON + '$(TARGET)-meson' \ + -Dharfbuzz=enabled \ + -Dpng=enabled \ + -Dzlib=enabled \ + -Dbrotli=disabled \ + -Dbzip2=disabled \ + '$(SOURCE_DIR)' \ + '$(BUILD_DIR)' + + ninja -C '$(BUILD_DIR)' install +endef define freetype_BUILD - # alias libharfbuzz and libfreetype to satisfy circular dependence - # libfreetype should already have been created by freetype-bootstrap.mk - $(if $(BUILD_STATIC), \ - ln -sf libharfbuzz.a '$(PREFIX)/$(TARGET)/lib/libharfbuzz_too.a' \ - && ln -sf libfreetype.a '$(PREFIX)/$(TARGET)/lib/libfreetype_too.a',) $($(PKG)_BUILD_COMMON) - $(if $(BUILD_STATIC), \ - # remove circular dependencies from pc file - $(SED) -i '/^Libs.private:/s/\-lharfbuzz_too -lfreetype_too//g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/freetype2.pc' \ - # avoid self-dependence within pc file - $(SED) -i '/^Libs.private:/s/\-lfreetype//g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/freetype2.pc') +endef + +define freetype-bootstrap_BUILD + $(subst harfbuzz=enabled,harfbuzz=disabled,$(freetype_BUILD_COMMON)) endef # exclude bz2 and gdk-pixbuf diff --git a/build/patches/freetype-2-fixes.patch b/build/patches/freetype-2-fixes.patch new file mode 100644 index 00000000..fa8be441 --- /dev/null +++ b/build/patches/freetype-2-fixes.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Kleis Auke Wolthuizen +Date: Fri, 3 Sep 2021 15:50:00 +0200 +Subject: [PATCH 1/1] Don't use __declspec(dllexport) for static builds + + +diff --git a/meson.build b/meson.build +index 1111111..2222222 100644 +--- a/meson.build ++++ b/meson.build +@@ -308,7 +308,7 @@ ftoption_h = custom_target('ftoption.h', + ft2_sources += ftoption_h + ft2_defines += ['-DFT_CONFIG_OPTIONS_H='] + +-if host_machine.system() == 'windows' ++if get_option('default_library') != 'static' and host_machine.system() == 'windows' + ft2_defines += ['-DDLL_EXPORT=1'] + endif + diff --git a/build/patches/glib-2-fixes.patch b/build/patches/glib-2-fixes.patch index 54c23f0b..fee6399e 100644 --- a/build/patches/glib-2-fixes.patch +++ b/build/patches/glib-2-fixes.patch @@ -42,7 +42,7 @@ diff --git a/meson.build b/meson.build index 1111111..2222222 100644 --- a/meson.build +++ b/meson.build -@@ -2042,40 +2042,17 @@ endif +@@ -2046,40 +2046,17 @@ endif # proxy-libintl subproject. # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible # implementations. This could be extended if issues are found in some platforms. @@ -104,7 +104,7 @@ index 1111111..2222222 100644 test_extra_programs += { # These three are manual-run tests because they need a session bus but don't bring one up themselves # FIXME: these build but don't seem to work! -@@ -568,7 +568,7 @@ if installed_tests_enabled +@@ -570,7 +570,7 @@ if installed_tests_enabled endforeach endif diff --git a/build/patches/glib-static.patch b/build/patches/glib-static.patch index ac9243f7..86c18bc0 100644 --- a/build/patches/glib-static.patch +++ b/build/patches/glib-static.patch @@ -12,7 +12,7 @@ diff --git a/gio/giomodule.c b/gio/giomodule.c index 1111111..2222222 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -1101,28 +1101,6 @@ extern GType _g_win32_network_monitor_get_type (void); +@@ -1102,28 +1102,6 @@ extern GType _g_win32_network_monitor_get_type (void); static HMODULE gio_dll = NULL; @@ -45,7 +45,7 @@ diff --git a/gio/meson.build b/gio/meson.build index 1111111..2222222 100644 --- a/gio/meson.build +++ b/gio/meson.build -@@ -803,7 +803,7 @@ else +@@ -804,7 +804,7 @@ else gio_dtrace_hdr = [] endif diff --git a/build/patches/poppler-20-fixes.patch b/build/patches/poppler-20-fixes.patch index 634a41c9..b0168bb5 100644 --- a/build/patches/poppler-20-fixes.patch +++ b/build/patches/poppler-20-fixes.patch @@ -2,56 +2,10 @@ 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: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 17 Mar 2018 20:52:10 +0100 -Subject: [PATCH 1/2] Do not overwrite all our build flags - - -diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake -index 1111111..2222222 100644 ---- a/cmake/modules/PopplerMacros.cmake -+++ b/cmake/modules/PopplerMacros.cmake -@@ -104,14 +104,14 @@ if(CMAKE_COMPILER_IS_GNUCXX) - set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") -+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") - set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}") -@@ -149,7 +149,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE") -+ set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") - # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 -@@ -157,7 +157,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}") - set(_save_cflags "${CMAKE_C_FLAGS}") -- set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE") -+ set(CMAKE_C_FLAGS "-std=c99 -D_DEFAULT_SOURCE ${_save_cflags}") - set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cflags}") - set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cflags}") - # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2 - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kleis Auke Wolthuizen Date: Fri, 19 Feb 2021 16:00:00 +0100 -Subject: [PATCH 2/2] Fix bogus volatiles caught by clang 11 +Subject: [PATCH 1/1] Fix bogus volatile caught by clang 11 diff --git a/glib/poppler-enums.c.template b/glib/poppler-enums.c.template diff --git a/build/patches/poppler-mingw-std-threads.patch b/build/patches/poppler-mingw-std-threads.patch index 691cfeec..ed373c67 100644 --- a/build/patches/poppler-mingw-std-threads.patch +++ b/build/patches/poppler-mingw-std-threads.patch @@ -12,15 +12,15 @@ diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cma index 1111111..2222222 100644 --- a/cmake/modules/PopplerMacros.cmake +++ b/cmake/modules/PopplerMacros.cmake -@@ -104,7 +104,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) +@@ -117,7 +117,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) + set(DEFAULT_COMPILE_WARNINGS "${_warn}") set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}") - set(_save_cxxflags "${CMAKE_CXX_FLAGS}") -- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") -+ set(CMAKE_CXX_FLAGS "-fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${_save_cxxflags}") - set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}") +- set(CMAKE_CXX_FLAGS "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") ++ set(CMAKE_CXX_FLAGS "-fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE") + set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g") + set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline") diff --git a/poppler/Annot.h b/poppler/Annot.h index 1111111..2222222 100644 --- a/poppler/Annot.h diff --git a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch index fb3c015e..226a82ea 100644 --- a/build/plugins/llvm-mingw/patches/rust-1-fixes.patch +++ b/build/plugins/llvm-mingw/patches/rust-1-fixes.patch @@ -290,7 +290,7 @@ diff --git a/library/unwind/src/libunwind.rs b/library/unwind/src/libunwind.rs index 1111111..2222222 100644 --- a/library/unwind/src/libunwind.rs +++ b/library/unwind/src/libunwind.rs -@@ -93,7 +93,7 @@ extern "C" { +@@ -102,7 +102,7 @@ extern "C" { } cfg_if::cfg_if! { @@ -299,12 +299,12 @@ index 1111111..2222222 100644 // Not ARM EHABI #[repr(C)] #[derive(Copy, Clone, PartialEq)] -@@ -107,7 +107,7 @@ if #[cfg(all(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm +@@ -116,7 +116,7 @@ if #[cfg(any(target_os = "ios", target_os = "netbsd", not(target_arch = "arm"))) pub use _Unwind_Action::*; - #[cfg_attr(all(feature = "llvm-libunwind", -- any(target_os = "fuchsia", target_os = "linux")), -+ any(target_os = "fuchsia", target_os = "linux", target_os = "windows")), - link(name = "unwind", kind = "static"))] + #[cfg_attr( +- all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux")), ++ all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "windows")), + link(name = "unwind", kind = "static", modifiers = "-bundle") + )] extern "C" { - pub fn _Unwind_GetGR(ctx: *mut _Unwind_Context, reg_index: c_int) -> _Unwind_Word; diff --git a/build/plugins/llvm-mingw/rust.mk b/build/plugins/llvm-mingw/rust.mk index aad1e7c7..1b9155de 100644 --- a/build/plugins/llvm-mingw/rust.mk +++ b/build/plugins/llvm-mingw/rust.mk @@ -2,13 +2,13 @@ PKG := rust $(PKG)_WEBSITE := https://www.rust-lang.org/ $(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency. $(PKG)_IGNORE := -# https://static.rust-lang.org/dist/2021-08-14/rustc-nightly-src.tar.gz.sha256 +# https://static.rust-lang.org/dist/2021-09-03/rustc-nightly-src.tar.gz.sha256 $(PKG)_VERSION := nightly -$(PKG)_CHECKSUM := 10a4866f209fec00e2b52e4b5adc46975df4b6ed89d1b7b5b389c1349f1a58e1 +$(PKG)_CHECKSUM := c03bb1749a2cba97d10970ddbc5b21dae9d629450ff01d801f2d1770cb4275de $(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch))) $(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src $(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.gz -$(PKG)_URL := https://static.rust-lang.org/dist/2021-08-14/$($(PKG)_FILE) +$(PKG)_URL := https://static.rust-lang.org/dist/2021-09-03/$($(PKG)_FILE) $(PKG)_DEPS := $(BUILD)~$(PKG) $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)