From f112ff272a74bbaa158f8557bffed39a475280a0 Mon Sep 17 00:00:00 2001
From: Pavel Tomanek <99190809+pavelToman@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:11:13 +0200
Subject: [PATCH] Separated PR created for patchelf fix - #21674

---
 .../patchelf-0.18.0_fix-alignment.patch       | 31 -------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 easybuild/easyconfigs/p/patchelf/patchelf-0.18.0_fix-alignment.patch

diff --git a/easybuild/easyconfigs/p/patchelf/patchelf-0.18.0_fix-alignment.patch b/easybuild/easyconfigs/p/patchelf/patchelf-0.18.0_fix-alignment.patch
deleted file mode 100644
index 20a233ddc66..00000000000
--- a/easybuild/easyconfigs/p/patchelf/patchelf-0.18.0_fix-alignment.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author - Pavel Tománek
-Fix alignment problem when rewriting sections
-https://github.com/NixOS/patchelf/pull/566
---- src/patchelf.cc.orig	2024-10-07 16:45:17.515584318 +0200
-+++ src/patchelf.cc	2024-10-07 16:47:14.622270000 +0200
-@@ -843,7 +843,7 @@
-         neededSpace += headerTableSpace;
-     debug("needed space is %d\n", neededSpace);
- 
--    Elf_Off startOffset = roundUp(fileContents->size(), getPageSize());
-+    Elf_Off startOffset = roundUp(fileContents->size(), alignStartPage);
- 
-     // In older version of binutils (2.30), readelf would check if the dynamic
-     // section segment is strictly smaller than the file (and not same size).
-@@ -879,7 +879,7 @@
-         rdi(lastSeg.p_type) == PT_LOAD &&
-         rdi(lastSeg.p_flags) == (PF_R | PF_W) &&
-         rdi(lastSeg.p_align) == alignStartPage) {
--        auto segEnd = roundUp(rdi(lastSeg.p_offset) + rdi(lastSeg.p_memsz), getPageSize());
-+        auto segEnd = roundUp(rdi(lastSeg.p_offset) + rdi(lastSeg.p_memsz), alignStartPage);
-         if (segEnd == startOffset) {
-             auto newSz = startOffset + neededSpace - rdi(lastSeg.p_offset);
-             wri(lastSeg.p_filesz, wri(lastSeg.p_memsz, newSz));
-@@ -898,6 +898,7 @@
-         wri(phdr.p_filesz, wri(phdr.p_memsz, neededSpace));
-         wri(phdr.p_flags, PF_R | PF_W);
-         wri(phdr.p_align, alignStartPage);
-+        assert(startPage % alignStartPage == startOffset % alignStartPage);
-     }
- 
-     normalizeNoteSegments();