From 6e247634d45f3396cf2c9887a99617acc2dd87d6 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 4 Jul 2024 04:32:17 +0000
Subject: [PATCH] Bug 1906219 - Upgrade mozmake to 4.4.1.
 r=firefox-build-system-reviewers,nalexander

Differential Revision: https://phabricator.services.mozilla.com/D215715
---
 taskcluster/kinds/fetch/toolchains.yml    |  6 ++--
 taskcluster/scripts/misc/build-mozmake.sh | 43 -----------------------
 2 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/taskcluster/kinds/fetch/toolchains.yml b/taskcluster/kinds/fetch/toolchains.yml
index 9617e0b81882..531d93ab3b77 100644
--- a/taskcluster/kinds/fetch/toolchains.yml
+++ b/taskcluster/kinds/fetch/toolchains.yml
@@ -551,9 +551,9 @@ gnumake:
     description: GNU make source
     fetch:
         type: static-url
-        url: https://ftp.gnu.org/gnu/make/make-4.3.tar.gz
-        sha256: e05fdde47c5f7ca45cb697e973894ff4f5d79e13b750ed57d7b66d8defc78e19
-        size: 2317073
+        url: https://ftp.gnu.org/gnu/make/make-4.4.1.tar.gz
+        sha256: dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3
+        size: 2348200
         artifact-name: make.tar.zst
         strip-components: 1
         add-prefix: make/
diff --git a/taskcluster/scripts/misc/build-mozmake.sh b/taskcluster/scripts/misc/build-mozmake.sh
index 455496787b51..79d77c1a2f47 100755
--- a/taskcluster/scripts/misc/build-mozmake.sh
+++ b/taskcluster/scripts/misc/build-mozmake.sh
@@ -5,49 +5,6 @@ set -x -e -v
 
 cd $MOZ_FETCHES_DIR/make
 
-# Patch for http://savannah.gnu.org/bugs/?58656
-patch -p1 <<'EOF'
-diff --git a/src/remake.c b/src/remake.c
-index fb237c5..b2ba069 100644
---- a/src/remake.c
-+++ b/src/remake.c
-@@ -35,6 +35,13 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
- #endif
- #ifdef WINDOWS32
- #include <io.h>
-+#include <sys/stat.h>
-+#if defined(_MSC_VER) && _MSC_VER > 1200
-+/* VC7 or later support _stat64 to access 64-bit file size. */
-+#define stat64 _stat64
-+#else
-+#define stat64 stat
-+#endif
- #endif
-
-
-@@ -1466,7 +1473,11 @@ static FILE_TIMESTAMP
- name_mtime (const char *name)
- {
-   FILE_TIMESTAMP mtime;
-+#if defined(WINDOWS32)
-+  struct stat64 st;
-+#else
-   struct stat st;
-+#endif
-   int e;
-
- #if defined(WINDOWS32)
-@@ -1498,7 +1509,7 @@ name_mtime (const char *name)
-         tend = &tem[0];
-       }
-
--    e = stat (tem, &st);
-+    e = stat64 (tem, &st);
-     if (e == 0 && !_S_ISDIR (st.st_mode) && tend < tem + (p - name - 1))
-       {
-         errno = ENOTDIR;
-EOF
-
 chmod +w src/config.h.W32
 sed "/#define BATCH_MODE_ONLY_SHELL/s/\/\*\(.*\)\*\//\1/" src/config.h.W32 > src/config.h
 make -f Basic.mk \