1
0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-09 10:20:45 +00:00

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.
This commit is contained in:
Tim Schumacher 2022-09-26 23:02:51 +02:00 committed by Linus Groh
parent 7578039188
commit 1faca15193
6 changed files with 8 additions and 6 deletions

View File

@ -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'

1
Ports/binutils/patches Symbolic link
View File

@ -0,0 +1 @@
../../Toolchain/Patches/binutils

View File

@ -1 +0,0 @@
../../../Toolchain/Patches/binutils.patch

View File

@ -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

View File

@ -1,6 +1,6 @@
# Patches for binutils on SerenityOS
## `binutils.patch`
## `0001-Add-support-for-SerenityOS.patch`
Add support for SerenityOS