system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-23 19:15:55 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Toolchain: Move the binutils patch into its own folder

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Meta/Azure/Caches.yml
View file

@ -26,7 +26,7 @@ steps:
- ${{ if eq(parameters.toolchain, 'gcc') }}: - ${{ if eq(parameters.toolchain, 'gcc') }}:
- task: Cache@2 - task: Cache@2
inputs: 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 path: $(Build.SourcesDirectory)/Toolchain/Cache
displayName: 'Toolchain Prebuilt Cache' displayName: 'Toolchain Prebuilt Cache'

1
Ports/binutils/patches Symbolic link
View file

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

1
Ports/binutils/patches/binutils.patch
View file

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

8
Toolchain/BuildIt.sh
View file

@ -251,11 +251,13 @@ pushd "$DIR/Tarballs"
git init > /dev/null git init > /dev/null
git add . > /dev/null git add . > /dev/null
git commit -am "BASE" > /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 else
patch -p1 < "$DIR"/Patches/binutils.patch > /dev/null for patch in "$DIR"/Patches/binutils/*.patch; do
patch -p1 < "$patch" > /dev/null
done
fi fi
$MD5SUM "$DIR"/Patches/binutils.patch > .patch.applied $MD5SUM "$DIR"/Patches/binutils/*.patch > .patch.applied
popd popd
if [ -d ${GCC_NAME} ]; then if [ -d ${GCC_NAME} ]; then

0
Toolchain/Patches/binutils.patch → Toolchain/Patches/binutils/0001-Add-support-for-SerenityOS.patch
View file

2
Ports/binutils/patches/ReadMe.md → Toolchain/Patches/binutils/ReadMe.md
View file

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