Merge 0dc3b4516b into 05ee72f21f

4 years ago · 12848ca96f
parent 05ee72f21f 0dc3b4516b
commit 12848ca96f
11 changed files with 304 additions and 65 deletions
--- a/src/cairo.mk
+++ b/src/cairo.mk
@ -21,7 +21,6 @@ define $(PKG)_BUILD
    $(SED) -i 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' '$(1)/src/cairo.pc.in'
    cd '$(1)' && ./configure \
        $(MXE_CONFIGURE_OPTS) \
-        --disable-lto \
        --disable-gtk-doc \
        --disable-test-surfaces \
        --disable-gcov \
@ -42,7 +41,7 @@ define $(PKG)_BUILD
        --enable-ps \
        --enable-pdf \
        --enable-svg \
-        --disable-pthread \
+        --enable-pthread \
        CFLAGS="$(CFLAGS) $(if $(BUILD_STATIC),-DCAIRO_WIN32_STATIC_BUILD)" \
        LIBS="-lmsimg32 -lgdi32 `$(TARGET)-pkg-config pixman-1 --libs`"
    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
--- a/src/cargo.mk
+++ b/src/cargo.mk
@ -0,0 +1,58 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG                     := cargo
+$(PKG)_WEBSITE          := https://www.rust-lang.org/
+$(PKG)_VERSION          := 0.38.0
+$(PKG)_DEPS_$(BUILD)    := cc
+
+ifneq (, $(findstring darwin,$(BUILD)))
+BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-apple-darwin
+else
+    ifneq (, $(findstring linux,$(BUILD)))
+    BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-unknown-linux-gnu
+    else
+    BUILD_TRIPLET = $(BUILD)
+    endif
+endif
+
+TARGET_TRIPLET          = $(firstword $(call split,-,$(TARGET)))-pc-windows-gnu
+$(PKG)_FILE             := $(PKG)-$($(PKG)_VERSION)-$(BUILD_TRIPLET).tar.xz
+$(PKG)_URL              := https://static.rust-lang.org/dist/$($(PKG)_FILE)
+
+# CHECKSUMS
+CHECKSUM_cargo-0.38.0-aarch64-unknown-linux-gnu     :=  ad8ec4973f341a341f8878c9307c63c1f555bc84c1238a494ff1319804e941b7
+CHECKSUM_cargo-0.38.0-arm-unknown-linux-gnueabi     :=  17daf6ee9c7223adde051794513e876859fd65f0a01bdb42a97e0c73de20954d
+CHECKSUM_cargo-0.38.0-arm-unknown-linux-gnueabihf       :=  8292e067cce9862617b0d0a25e355bd878ecb18ec426742a27826c03f0ca63cd
+CHECKSUM_cargo-0.38.0-armv7-unknown-linux-gnueabihf     :=  65b25cd58cb955814028635cce6e2cc3ec684eae7dbdc44db54462dae09e0e8a
+CHECKSUM_cargo-0.38.0-i686-apple-darwin     :=  36bcf704c49b6ed033bbefae235a6282f4ecdb0a365086e0e81d23c3080b312d
+CHECKSUM_cargo-0.38.0-i686-unknown-freebsd      :=  e1fbbb8d0ccf32c611b110e66b79a8d97acae82e3bac0876bd9b2f85724df9dc
+CHECKSUM_cargo-0.38.0-i686-unknown-linux-gnu        :=  a6c3781d8b2bf8619fc2231b01dc73877756c7bbbc1a68c521b9e748b3b7737a
+CHECKSUM_cargo-0.38.0-mips-unknown-linux-gnu        :=  75088420e209cf847f0558cc3b1b160ae3055f6d12eeb6fdf60299eef0708df2
+CHECKSUM_cargo-0.38.0-mips64-unknown-linux-gnuabi64     :=  17ff46bc026723f0ddb8728ba6718fe7250535b6d789901e9348bff82e4eccde
+CHECKSUM_cargo-0.38.0-mips64el-unknown-linux-gnuabi64       :=  fadc235adec83edb15004f68560a0f048ab421ab34dd03d9ecffbbaa6de70aad
+CHECKSUM_cargo-0.38.0-mipsel-unknown-linux-gnu      :=  e828539682b74fcc866f26a49515f4fa6c93d7bc4e2df2037bb6597839d30aac
+CHECKSUM_cargo-0.38.0-powerpc-unknown-linux-gnu     :=  c39489194624820cda94e0512eb4bffb723e67f2d574c890bb8dd8e30dd6b381
+CHECKSUM_cargo-0.38.0-powerpc64-unknown-linux-gnu       :=  fcc3b755e00e029d2b9aaf6acc1be5716bdc75f9fb8036c82130b30183f486bb
+CHECKSUM_cargo-0.38.0-powerpc64le-unknown-linux-gnu     :=  8be0c71639c22e18815971079e46e7f3e5bce25365658ca39349e694321b92db
+CHECKSUM_cargo-0.38.0-s390x-unknown-linux-gnu       :=  55850a04d70e62de93cecafe8dd33ef152aaf99ad26e96de6a269ee44dbc895a
+CHECKSUM_cargo-0.38.0-x86_64-apple-darwin       :=  7a3e48846c9616ccc7dcd641e79b3a08e49dd15f5b134477d52da0615c7146bf
+CHECKSUM_cargo-0.38.0-x86_64-unknown-freebsd        :=  8741a4724096f2cff5616baf66ef1ec17efa9b0f62c353bd31d3ccf072a78fce
+CHECKSUM_cargo-0.38.0-x86_64-unknown-linux-gnu      :=  a3ba2df5e21aaba70e40bd289e4b3bab3df516c4e374c7178d3762338949df56
+CHECKSUM_cargo-0.38.0-x86_64-unknown-linux-musl     :=  84fba8b477aa966519994d2b61611fd13483e99c90642fd544ee59df10a05634
+CHECKSUM_cargo-0.38.0-x86_64-unknown-netbsd     :=  7296e328943e22145461f839b4990b5701db2024414aba5710445ca6ced5dc74
+
+$(PKG)_CHECKSUM         := $(CHECKSUM_$(PKG)-$($(PKG)_VERSION)-$(BUILD_TRIPLET))
+$(PKG)_TARGETS          := $(BUILD)
+
+define $(PKG)_UPDATE
+    stable_date := $(shell curl https://static.rust-lang.org/dist/channel-rust-stable-date.txt)
+    $(WGET) -q -O- 'https://static.rust-lang.org/dist/$(stable_date)/' | \
+    $(SED) -n 's,.*$(PKG)-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    grep -v 'alpha\|beta\|rc\|git\|nightly' | \
+    $(SORT) -Vr | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    $(SOURCE_DIR)/$(PKG)-$($(PKG)_VERSION)-$(BUILD_TRIPLET)/install.sh --prefix=$(PREFIX)/$(BUILD) --verbose
+endef
--- a/src/get-target-triplet.mk
+++ b/src/get-target-triplet.mk
@ -0,0 +1,10 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG                     := get-target-triplet
+$(PKG)_VERSION          := 1.0.0
+$(PKG)_TYPE             := meta
+$(PKG)_DEPS             := cc
+
+define $(PKG)_BUILD
+    printf $(TARGET) > $(MXE_TMP)/get-target-triplet.txt
+endef
--- a/src/librsvg-1-fixes.patch
+++ b/src/librsvg-1-fixes.patch
@ -22,45 +22,10 @@ index 1111111..2222222 100644
 Libs: -L${libdir} -lrsvg-@RSVG_API_MAJOR_VERSION@ -lm
 Cflags: -I${includedir}/librsvg-@RSVG_API_VERSION@

-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@src.gnome.org>
-Date: Mon, 18 Aug 2014 12:27:28 +0800
-Subject: [PATCH 2/3] rsvg-base.c: Have realpath() Work On Windows
-
-Use _fullpath() on Windows to do the job for realpath() as realpath() does
-not exist on Windows.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710163
-
-Taken from: https://bug710163.bugzilla-attachments.gnome.org/attachment.cgi?id=283702
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-
-diff --git a/rsvg-base.c b/rsvg-base.c
-index 1111111..2222222 100644
--- a/rsvg-base.c
-+++ b/rsvg-base.c
-@@ -57,6 +57,15 @@
- #include "rsvg-paint-server.h"
- #include "rsvg-xml.h"
- 
-+/*
-+ * XXX: Perhaps do a GIO-based implementation for
-+ * realpath() or use gnulib implementation for this
-+ * https://bugzilla.gnome.org/show_bug.cgi?id=710163
-+ */
-+#ifdef G_OS_WIN32
-+#define realpath(a,b) _fullpath(b,a,_MAX_PATH)
-+#endif
-+
- /*
-  * This is configurable at runtime
-  */
-
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Timothy Gu <timothygu99@gmail.com>
 Date: Wed, 17 Sep 2014 17:00:13 -0700
-Subject: [PATCH 3/3] Disable checking gio-unix-2.0 and disable rsvg_convert
+Subject: [PATCH 2/3] Disable checking gio-unix-2.0 and disable rsvg_convert
 program

 rsvg_convert uses Unix features.
@ -72,20 +37,20 @@ diff --git a/Makefile.in b/Makefile.in
 index 1111111..2222222 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -81,7 +81,7 @@ PRE_UNINSTALL = :
+@@ -91,7 +91,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-bin_PROGRAMS = rsvg-convert$(EXEEXT) $(am__EXEEXT_1)
-+#bin_PROGRAMS = rsvg-convert$(EXEEXT) $(am__EXEEXT_1)
- @HAVE_GTK_3_TRUE@am__append_1 = rsvg-view-3
- @OS_WIN32_TRUE@am__append_2 = -mwindows
- @HAVE_INTROSPECTION_TRUE@am__append_3 = $(nodist_gir_DATA) $(nodist_typelibs_DATA)
+-bin_PROGRAMS = rsvg-convert$(EXEEXT)
+#bin_PROGRAMS = rsvg-convert$(EXEEXT)
+ @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_1 = $(VAPIGEN_VAPIS)
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 diff --git a/configure b/configure
 index 1111111..2222222 100755
 --- a/configure
 +++ b/configure
-@@ -13662,12 +13662,12 @@ if test -n "$RSVG_CONVERT_CFLAGS"; then
+@@ -17066,12 +17066,12 @@ if test -n "$RSVG_CONVERT_CFLAGS"; then
     pkg_cv_RSVG_CONVERT_CFLAGS="$RSVG_CONVERT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@ -101,7 +66,7 @@ index 1111111..2222222 100755
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
-@@ -13679,12 +13679,12 @@ if test -n "$RSVG_CONVERT_LIBS"; then
+@@ -17083,12 +17083,12 @@ if test -n "$RSVG_CONVERT_LIBS"; then
     pkg_cv_RSVG_CONVERT_LIBS="$RSVG_CONVERT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
@ -117,7 +82,7 @@ index 1111111..2222222 100755
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
-@@ -13705,14 +13705,14 @@ else
+@@ -17109,14 +17109,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
@ -135,3 +100,25 @@ index 1111111..2222222 100755
 
 $RSVG_CONVERT_PKG_ERRORS
 
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Gregorio Litenstein <g.litenstein@gmail.com>
+Date: Sun, 20 Oct 2019 15:27:56 -0300
+Subject: [PATCH 3/3] Change LTO to Thin-LTO
+
+
+diff --git a/Cargo.toml b/Cargo.toml
+index 1111111..2222222 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -6,8 +6,8 @@ members = [
+ ]
+ 
+ [profile.release]
+-lto = true
+lto = 'thin'
+ debug = true
+ 
+ [profile.bench]
+-lto = true
+lto = 'thin'
--- a/src/librsvg-test.c
+++ b/src/librsvg-test.c
@ -11,7 +11,6 @@ int main(int argc, char *argv[])
    (void)argc;
    (void)argv;

-    g_type_init();
    handle = rsvg_handle_new();
    g_object_unref(handle);

--- a/src/librsvg.mk
+++ b/src/librsvg.mk
@ -1,14 +1,25 @@
 # This file is part of MXE. See LICENSE.md for licensing information.

 PKG             := librsvg
-$(PKG)_WEBSITE  := https://librsvg.sourceforge.io/
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.40.5
-$(PKG)_CHECKSUM := d14d7b3e25023ce34302022fd7c9b3a468629c94dff6c177874629686bfc71a7
+$(PKG)_WEBSITE  := https://wiki.gnome.org/Projects/LibRsvg
+$(PKG)_VERSION  := 2.46.4
+$(PKG)_CHECKSUM := b45b9ee3b64c58baaf800bcdff5fcd04d79930dba4c56e46e0d3b0aead40cc29
 $(PKG)_SUBDIR   := librsvg-$($(PKG)_VERSION)
 $(PKG)_FILE     := librsvg-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc cairo gdk-pixbuf glib libcroco libgsf pango
+$(PKG)_DEPS     := cc cairo gdk-pixbuf glib libcroco libgsf pango $(BUILD)~rustc rust-std
+
+ifneq (, $(findstring darwin,$(BUILD)))
+    BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-apple-darwin
+else
+    ifneq (, $(findstring ibm-linux,$(BUILD)))
+        BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-unknown-linux-gnu
+    else
+        BUILD_TRIPLET = $(BUILD)
+    endif
+endif
+
+TARGET_TRIPLET          = $(firstword $(call split,-,$(TARGET)))-pc-windows-gnu

 define $(PKG)_UPDATE
    $(WGET) -q -O- 'https://gitlab.gnome.org/GNOME/librsvg/tags' | \
@ -17,17 +28,26 @@ define $(PKG)_UPDATE
 endef

 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        $(MXE_CONFIGURE_OPTS) \
-        $(if $(BUILD_STATIC), \
-          --disable-pixbuf-loader,) \
+    cat '$(PREFIX)/$(TARGET)/.cargo/config' >> '$(SOURCE_DIR)/.cargo/config'
+    cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \
+        --build=$(BUILD_TRIPLET) \
+        --host=$(TARGET) \
+        --prefix='$(PREFIX)/$(TARGET)' \
        --disable-gtk-doc \
-        --enable-introspection=no
-    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+        $(if $(BUILD_STATIC), \
+        --enable-static --disable-shared --disable-pixbuf-loader, \
+        --disable-static --enable-shared) \
+        --enable-gtk-doc=no \
+        --enable-introspection=no \
+        RUST_TARGET=$(TARGET_TRIPLET) \
+        RUSTC='$(PREFIX)/$(BUILD)/bin/rustc' \
+        CARGO='$(PREFIX)/$(BUILD)/bin/cargo' \
+        LIBS='-luserenv -lws2_32 -liphlpapi -ldnsapi'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=

    '$(TARGET)-gcc' \
        -mwindows -W -Wall -Werror -Wno-error=deprecated-declarations \
        -std=c99 -pedantic \
        '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-librsvg.exe' \
-        `'$(TARGET)-pkg-config' librsvg-2.0 --cflags --libs`
+        `'$(TARGET)-pkg-config' librsvg-2.0 --cflags --libs` -liphlpapi -ldnsapi
 endef
--- a/src/pango-1-fixes.patch
+++ b/src/pango-1-fixes.patch
@ -15,9 +15,9 @@ index 1111111..2222222 100644
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
-SUBDIRS= pango pango-view examples docs tools tests build
-+SUBDIRS= pango pango-view examples tools tests build
- 
+-SUBDIRS= pango pango-view examples docs tools tests win32
+SUBDIRS= pango pango-view examples tools tests win32
+
 EXTRA_DIST = 			\
 	autogen.sh		\
 diff --git a/autogen.sh b/autogen.sh
--- a/src/pango.mk
+++ b/src/pango.mk
@ -4,8 +4,8 @@ PKG             := pango
 $(PKG)_WEBSITE  := https://www.pango.org/
 $(PKG)_DESCR    := Pango
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.37.4
-$(PKG)_CHECKSUM := ae2446f1c23c81d78e935054a37530336818c214f54bed2351bdd4ad0acebcbe
+$(PKG)_VERSION  := 1.40.14
+$(PKG)_CHECKSUM := 90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3
 $(PKG)_SUBDIR   := pango-$($(PKG)_VERSION)
 $(PKG)_FILE     := pango-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := https://download.gnome.org/sources/pango/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
--- a/src/rust-std-bootstrap.mk
+++ b/src/rust-std-bootstrap.mk
@ -0,0 +1,59 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG                     := rust-std-bootstrap
+$(PKG)_BASE             := $(subst -bootstrap,,$(PKG))
+$(PKG)_WEBSITE          := https://www.rust-lang.org/
+$(PKG)_VERSION          := 1.37.0
+$(PKG)_DEPS_$(BUILD)    := cc
+
+ifneq (, $(findstring darwin,$(BUILD)))
+BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-apple-darwin
+else
+    ifneq (, $(findstring linux,$(BUILD)))
+    BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-unknown-linux-gnu
+    else
+    BUILD_TRIPLET = $(BUILD)
+    endif
+endif
+
+TARGET_TRIPLET          = $(firstword $(call split,-,$(TARGET)))-pc-windows-gnu
+$(PKG)_FILE             := $($(PKG)_BASE)-$($(PKG)_VERSION)-$(BUILD_TRIPLET).tar.xz
+$(PKG)_URL              := https://static.rust-lang.org/dist/$($(PKG)_FILE)
+
+# CHECKSUMS
+CHECKSUM_rust-std-1.37.0-aarch64-unknown-linux-gnu      :=  eb0105a56563112ac841171d94d92ce1e7da1e7affa26488c04cb1dbe822c76b
+CHECKSUM_rust-std-1.37.0-arm-unknown-linux-gnueabi      :=  7f1b5ccc166227e470d5da4729a05841e76b29354e3e935ed0b3987711e4b69f
+CHECKSUM_rust-std-1.37.0-arm-unknown-linux-gnueabihf        :=  dd70092a71fd1b38f826156b4a0097d86a345850c73de904592a42a00e0cf3e0
+CHECKSUM_rust-std-1.37.0-armv7-unknown-linux-gnueabihf      :=  727e6132033eedd1c4d60765f858a36e4b395c91417cea1c635c27374a94ab2b
+CHECKSUM_rust-std-1.37.0-i686-apple-darwin      :=  290f963447c0f15a4cc165499a0076848b7c7b88c88d3a228a2c0dbf810b6eba
+CHECKSUM_rust-std-1.37.0-i686-unknown-freebsd       :=  61fb3424319cd320e0ea6aeb0084fc4211656265254e740233e330f996158b31
+CHECKSUM_rust-std-1.37.0-i686-unknown-linux-gnu     :=  420215f355a082bd8273ab5f92e1e9c10e277a8773807020549949ee3b95b566
+CHECKSUM_rust-std-1.37.0-mips-unknown-linux-gnu     :=  c9bada4d39d868b32be2a83f7290b175ee8d64727998adf1a98577c44423405f
+CHECKSUM_rust-std-1.37.0-mips64-unknown-linux-gnuabi64      :=  a51aa953790037894849ae3f1f09de2a347d50eaa5ae9af1317047bee1ea3aef
+CHECKSUM_rust-std-1.37.0-mips64el-unknown-linux-gnuabi64        :=  a395ae36331700bad8dbc1eb370fcb5f639a2a1877c5ce031732d12c7fc4a8d8
+CHECKSUM_rust-std-1.37.0-mipsel-unknown-linux-gnu       :=  ad737c57ecf75a3f90c0e902ac13aa62dfd697d9e09ffc962f71ee82e490d364
+CHECKSUM_rust-std-1.37.0-powerpc-unknown-linux-gnu      :=  8e2cb813df975fe6a2e728757e373c32b8689077585514860be0218d90f860cd
+CHECKSUM_rust-std-1.37.0-powerpc64-unknown-linux-gnu        :=  2761bee0ff224ebce4b500bcf0b21f1ca8b800b3fb9acfdcf9875f9ba0d79fc4
+CHECKSUM_rust-std-1.37.0-powerpc64le-unknown-linux-gnu      :=  8939ead9e9b6adea8b5bb3365fec7c2b5420e5d0b1c595fafa7d8b1fc5cf429f
+CHECKSUM_rust-std-1.37.0-s390x-unknown-linux-gnu        :=  828e9df85e7eac189a3fcc4c1ec0affa54d128c6fe873b76ac74b33f13135bea
+CHECKSUM_rust-std-1.37.0-x86_64-apple-darwin        :=  8fe94b20ede22b768d86c0fb29c9dd17dda30f7ab411b5c540654ea1ae8ebb20
+CHECKSUM_rust-std-1.37.0-x86_64-unknown-freebsd     :=  262d294a1b71712118c14acdd43198ef958a5e95ba5da0b3b46153a8e959cb22
+CHECKSUM_rust-std-1.37.0-x86_64-unknown-linux-gnu       :=  f8090dbd8a2dda674f8832f7999758b248028453465bf83f797569e28065fdbc
+CHECKSUM_rust-std-1.37.0-x86_64-unknown-linux-musl      :=  985d511eb43c1083f5961c0dfb953cd01c0818a7200593fade278cde7502f836
+CHECKSUM_rust-std-1.37.0-x86_64-unknown-netbsd      :=  2bea6c1e9b60dae314721307cfb15db9718cb970e1f2944ac41974faf77ea0d5
+
+$(PKG)_CHECKSUM         := $(CHECKSUM_$($(PKG)_BASE)-$($(PKG)_VERSION)-$(BUILD_TRIPLET))
+$(PKG)_TARGETS          := $(BUILD)
+
+define $(PKG)_UPDATE
+    stable_date := $(shell curl https://static.rust-lang.org/dist/channel-rust-stable-date.txt)
+    $(WGET) -q -O- 'https://static.rust-lang.org/dist/$(stable_date)/' | \
+    $(SED) -n 's,.*$($(PKG)_BASE)-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    grep -v 'alpha\|beta\|rc\|git\|nightly' | \
+    $(SORT) -Vr | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    $(SOURCE_DIR)/$($(PKG)_BASE)-$($(PKG)_VERSION)-$(BUILD_TRIPLET)/install.sh --prefix=$(PREFIX)/$(BUILD) --verbose
+endef
--- a/src/rust-std.mk
+++ b/src/rust-std.mk
@ -0,0 +1,49 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG                     := rust-std
+$(PKG)_WEBSITE          := https://www.rust-lang.org/
+$(PKG)_VERSION          := 1.37.0
+
+$(PKG)_DEPS             := cc $(BUILD)~cargo $(BUILD)~rustc $(BUILD)~rust-std-bootstrap get-target-triplet
+
+ifneq (, $(findstring darwin,$(BUILD)))
+    BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-apple-darwin
+else
+    ifneq (, $(findstring linux,$(BUILD)))
+        BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-unknown-linux-gnu
+    else
+        BUILD_TRIPLET = $(BUILD)
+    endif
+endif
+
+define DEP_TARGET
+$(shell [ -f "$(MXE_TMP)/get-target-triplet.txt" ] && cat "$(MXE_TMP)/get-target-triplet.txt" || echo ERROR)
+endef
+
+TARGET_TRIPLET          = $(firstword $(call split,-,$(DEP_TARGET)))-pc-windows-gnu
+
+CHECKSUM_rust-std-1.37.0-x86_64-pc-windows-gnu      := ff7665735afb052e43da20ed206e135da4977b9bffbaf394c4571259950ca6a4
+CHECKSUM_rust-std-1.37.0-i686-pc-windows-gnu        := 0667452dcca5c08dc6c4a3d5f38852b9a883489793d035dea6fcccd2b9a219f9
+
+$(PKG)_FILE             := $(PKG)-$($(PKG)_VERSION)-$(TARGET_TRIPLET).tar.xz
+$(PKG)_URL              := https://static.rust-lang.org/dist/$($(PKG)_FILE)
+$(PKG)_CHECKSUM         := $(CHECKSUM_$(PKG)-$($(PKG)_VERSION)-$(TARGET_TRIPLET))
+COMMA                   := ,
+
+define $(PKG)_UPDATE
+    $(WGET) -q -O- 'https://static.rust-lang.org/dist/' | \
+    $(SED) -n 's,.*$(PKG)-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    grep -v 'alpha\|beta\|rc\|git\|nightly' | \
+    $(SORT) -Vr | \
+    head -1
+endef
+
+define $(PKG)_CARGO_CONFIG_OPTS
+"\n[build]\ncargo = '$(PREFIX)/$(BUILD)/bin/cargo'\nrustc = '$(PREFIX)/$(BUILD)/bin/rustc'\nrustdoc = '$(PREFIX)/$(BUILD)/bin/rustdoc'\nrustflags = ['-C','target-feature=$(if $(BUILD_SHARED),-crt-static,+crt-static)','-C','panic=$(if $(findstring i686,$(TARGET_TRIPLET)),abort,unwind)','-L','dependency=$(PREFIX)/$(BUILD)/lib/rustlib','-L','native=$(PREFIX)/$(TARGET)/bin','-L','native=$(PREFIX)/$(TARGET)/lib']\n\n[target.$(TARGET_TRIPLET)]\nlinker = '$(TARGET)-gcc'\nar = '$(TARGET)-ar'\n\n[term]\nverbose = true"
+endef
+
+define $(PKG)_BUILD
+    $(SOURCE_DIR)/$(PKG)-$($(PKG)_VERSION)-$(TARGET_TRIPLET)/install.sh --prefix=$(PREFIX)/$(BUILD) --verbose
+    mkdir -p $(PREFIX)/$(TARGET)/.cargo
+    printf $($(PKG)_CARGO_CONFIG_OPTS) > $(PREFIX)/$(TARGET)/.cargo/config
+endef
--- a/src/rustc.mk
+++ b/src/rustc.mk
@ -0,0 +1,58 @@
+# This file is part of MXE. See LICENSE.md for licensing information.
+
+PKG                     := rustc
+$(PKG)_WEBSITE          := https://www.rust-lang.org/
+$(PKG)_VERSION          := 1.37.0
+$(PKG)_DEPS_$(BUILD)    := cc
+
+ifneq (, $(findstring darwin,$(BUILD)))
+    BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-apple-darwin
+else
+    ifneq (, $(findstring linux,$(BUILD)))
+        BUILD_TRIPLET = $(firstword $(call split,-,$(BUILD)))-unknown-linux-gnu
+    else
+        BUILD_TRIPLET = $(BUILD)
+    endif
+endif
+
+TARGET_TRIPLET          = $(firstword $(call split,-,$(TARGET)))-pc-windows-gnu
+$(PKG)_FILE             := $(PKG)-$($(PKG)_VERSION)-$(BUILD_TRIPLET).tar.xz
+$(PKG)_URL              := https://static.rust-lang.org/dist/$($(PKG)_FILE)
+
+# CHECKSUMS
+CHECKSUM_rustc-1.37.0-aarch64-unknown-linux-gnu     :=  8e06a483a5764f687db8e352591ab651c7a78e3be06af2d2a4f33d6c9b158c59
+CHECKSUM_rustc-1.37.0-arm-unknown-linux-gnueabi     :=  d6c3ec6474501d40cdf90e84f5308f0eb09a4f03fea9214df1f5eea0b9b8013e
+CHECKSUM_rustc-1.37.0-arm-unknown-linux-gnueabihf       :=  0b03246d21a1618aa2cba7ec09eae03694f76943ae58a5f3eaea646f16022a26
+CHECKSUM_rustc-1.37.0-armv7-unknown-linux-gnueabihf     :=  d5a8a2fd71ca8bafb930b0eb9d23231131a6f992640885ba4976d6955948efd2
+CHECKSUM_rustc-1.37.0-i686-apple-darwin     :=  65e23eda010f8a3287d527bc67226f3a5276e43bc3eadd99112c8041794e2385
+CHECKSUM_rustc-1.37.0-i686-unknown-freebsd      :=  2559d79557ddeccdedcef9b592655be67bda21ebcdbd7773572927fe62c1becb
+CHECKSUM_rustc-1.37.0-i686-unknown-linux-gnu        :=  f0d7740264040663a0afca19b1c597dda81ef71b7489cbf675116241fedf3637
+CHECKSUM_rustc-1.37.0-mips-unknown-linux-gnu        :=  cc699d06f0da4d7da230534ee870889200c7c75ec1403ff4eba3679249420a49
+CHECKSUM_rustc-1.37.0-mips64-unknown-linux-gnuabi64     :=  5f64ab1649f4a30dfc445e7aa59e88c7d95883474ff8381250555941429c69be
+CHECKSUM_rustc-1.37.0-mips64el-unknown-linux-gnuabi64       :=  d8a23cecfed41dbe5bf2e18945ee72d91a0155cf41ed99bbf277cf7a3e0e6887
+CHECKSUM_rustc-1.37.0-mipsel-unknown-linux-gnu      :=  a0971cd1af153784164ed3e644b80a524f8271f0d6b787a5e4ce547780a8aa54
+CHECKSUM_rustc-1.37.0-powerpc-unknown-linux-gnu     :=  ecff5acba4a06c3b29fedf618364b054318f5a873849bde1fa81d8397faf2bc1
+CHECKSUM_rustc-1.37.0-powerpc64-unknown-linux-gnu       :=  83bc3022b3874961163933f493f4ba1d37b43f737d832d9f5f031e5f3651d765
+CHECKSUM_rustc-1.37.0-powerpc64le-unknown-linux-gnu     :=  40ff4c1da1ffc685033ca6b9a618588cd4fa5bdc135efea585efeb2b069057d0
+CHECKSUM_rustc-1.37.0-s390x-unknown-linux-gnu       :=  1edc7ae7a7dbcffa7eb65341806b0f2cad15a5c571ee6786175572bda5dd5380
+CHECKSUM_rustc-1.37.0-x86_64-apple-darwin       :=  403b1ee63235b6a196a6eb99f315b05ce007558cc7041150251354cfbf734f07
+CHECKSUM_rustc-1.37.0-x86_64-unknown-freebsd        :=  077509f49f3546bef943476387e1a9b22f4a42544841b17e5997900179be35be
+CHECKSUM_rustc-1.37.0-x86_64-unknown-linux-gnu      :=  7014f34578a0bbfffc09bf53d536e29f4ec37bfc48a579d372a340b4d6763416
+CHECKSUM_rustc-1.37.0-x86_64-unknown-linux-musl     :=  b2edb942f73604973f7281e1d51629f75274ed64394edaba55ea9f35cc3c66de
+CHECKSUM_rustc-1.37.0-x86_64-unknown-netbsd     :=  3e88d16311618280b6119cc055864b180724d0fbd46c26d5b5cc21e6dc3d3199
+
+$(PKG)_CHECKSUM         := $(CHECKSUM_$(PKG)-$($(PKG)_VERSION)-$(BUILD_TRIPLET))
+$(PKG)_TARGETS          := $(BUILD)
+
+define $(PKG)_UPDATE
+    stable_date := $(shell curl https://static.rust-lang.org/dist/channel-rust-stable-date.txt)
+    $(WGET) -q -O- 'https://static.rust-lang.org/dist/$(stable_date)/' | \
+    $(SED) -n 's,.*$(PKG)-\([0-9][^>]*\)\.tar.*,\1,p' | \
+    grep -v 'alpha\|beta\|rc\|git\|nightly' | \
+    $(SORT) -Vr | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    $(SOURCE_DIR)/$(PKG)-$($(PKG)_VERSION)-$(BUILD_TRIPLET)/install.sh --prefix=$(PREFIX)/$(BUILD) --verbose
+endef