From 1faca15193e5ceefc0249d3337c7110839d54988 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Mon, 26 Sep 2022 23:02:51 +0200
Subject: [PATCH] Toolchain: Move the binutils patch into its own folder

This makes binutils compatible with `./package.sh dev`, so that we can
regenerate patches more easily, and neatly stack (temporary) patches on
top.
---
 Meta/Azure/Caches.yml                                     | 2 +-
 Ports/binutils/patches                                    | 1 +
 Ports/binutils/patches/binutils.patch                     | 1 -
 Toolchain/BuildIt.sh                                      | 8 +++++---
 .../0001-Add-support-for-SerenityOS.patch}                | 0
 .../patches => Toolchain/Patches/binutils}/ReadMe.md      | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
 create mode 120000 Ports/binutils/patches
 delete mode 120000 Ports/binutils/patches/binutils.patch
 rename Toolchain/Patches/{binutils.patch => binutils/0001-Add-support-for-SerenityOS.patch} (100%)
 rename {Ports/binutils/patches => Toolchain/Patches/binutils}/ReadMe.md (77%)

diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml
index 5fda3cf096..bd556e56e7 100644
--- a/Meta/Azure/Caches.yml
+++ b/Meta/Azure/Caches.yml
@@ -26,7 +26,7 @@ steps:
     - ${{ if eq(parameters.toolchain, 'gcc') }}:
       - task: Cache@2
         inputs:
-          key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/binutils.patch | Toolchain/Patches/gcc/*.patch | Userland/Libraries/LibC/**/*.h'
+          key: '"toolchain" | "${{ parameters.arch }}" | Toolchain/BuildIt.sh | Toolchain/Patches/binutils/*.patch | Toolchain/Patches/gcc/*.patch | Userland/Libraries/LibC/**/*.h'
           path: $(Build.SourcesDirectory)/Toolchain/Cache
         displayName: 'Toolchain Prebuilt Cache'
 
diff --git a/Ports/binutils/patches b/Ports/binutils/patches
new file mode 120000
index 0000000000..90c1068206
--- /dev/null
+++ b/Ports/binutils/patches
@@ -0,0 +1 @@
+../../Toolchain/Patches/binutils
\ No newline at end of file
diff --git a/Ports/binutils/patches/binutils.patch b/Ports/binutils/patches/binutils.patch
deleted file mode 120000
index fbb1ca3b40..0000000000
--- a/Ports/binutils/patches/binutils.patch
+++ /dev/null
@@ -1 +0,0 @@
-../../../Toolchain/Patches/binutils.patch
\ No newline at end of file
diff --git a/Toolchain/BuildIt.sh b/Toolchain/BuildIt.sh
index f4f6bde073..e42255fecb 100755
--- a/Toolchain/BuildIt.sh
+++ b/Toolchain/BuildIt.sh
@@ -251,11 +251,13 @@ pushd "$DIR/Tarballs"
             git init > /dev/null
             git add . > /dev/null
             git commit -am "BASE" > /dev/null
-            git am "$DIR"/Patches/binutils.patch > /dev/null
+            git am "$DIR"/Patches/binutils/*.patch > /dev/null
         else
-            patch -p1 < "$DIR"/Patches/binutils.patch > /dev/null
+            for patch in "$DIR"/Patches/binutils/*.patch; do
+                patch -p1 < "$patch" > /dev/null
+            done
         fi
-        $MD5SUM "$DIR"/Patches/binutils.patch > .patch.applied
+        $MD5SUM "$DIR"/Patches/binutils/*.patch > .patch.applied
     popd
 
     if [ -d ${GCC_NAME} ]; then
diff --git a/Toolchain/Patches/binutils.patch b/Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch
similarity index 100%
rename from Toolchain/Patches/binutils.patch
rename to Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch
diff --git a/Ports/binutils/patches/ReadMe.md b/Toolchain/Patches/binutils/ReadMe.md
similarity index 77%
rename from Ports/binutils/patches/ReadMe.md
rename to Toolchain/Patches/binutils/ReadMe.md
index 1f124cd080..c82aeed5a6 100644
--- a/Ports/binutils/patches/ReadMe.md
+++ b/Toolchain/Patches/binutils/ReadMe.md
@@ -1,6 +1,6 @@
 # Patches for binutils on SerenityOS
 
-## `binutils.patch`
+## `0001-Add-support-for-SerenityOS.patch`
 
 Add support for SerenityOS