rpms/webkit2gtk3
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update for removal of aarch64 page size build option

Browse Source 
In an act of self-sabotage, I removed this build option:

https://bugs.webkit.org/show_bug.cgi?id=227905

and then forgot that I had done so. We still need it because RHEL 9 is
built on RHEL 8, and the build will crash if it doesn't support 64 KB
pages.

Related: #1985041
This commit is contained in:
Michael Catanzaro 2021-09-29 14:44:36 -05:00 committed by Michael Catanzaro
parent f4f26b101f
commit 7407241a3a
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
aarch64-page-size.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h
index 8ff8443d0e25..2fa880a97d1d 100644
--- a/Source/WTF/wtf/PageBlock.h
+++ b/Source/WTF/wtf/PageBlock.h
@@ -46,9 +46,9 @@ namespace WTF {
// Use 64 KiB for any unknown CPUs to be conservative.
#if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64)
constexpr size_t CeilingOnPageSize = 16 * KB;
-#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
+#elif CPU(ARM64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN)
constexpr size_t CeilingOnPageSize = 64 * KB;
-#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64)
+#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64)
constexpr size_t CeilingOnPageSize = 4 * KB;
#else
#error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture!

9
webkit2gtk3.spec
View File

@ -27,6 +27,10 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3
Source2: https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg
# https://bugs.webkit.org/show_bug.cgi?id=217989
# https://bugs.webkit.org/show_bug.cgi?id=227905
Patch0: aarch64-page-size.patch
BuildRequires: bison
BuildRequires: bubblewrap
BuildRequires: cmake
@ -222,7 +226,8 @@ rm -rf Source/ThirdParty/qunit/
%endif
%if 0%{?rhel}
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
-DENABLE_JIT=OFF \
-DUSE_SYSTEM_MALLOC=ON \
%endif
%endif
%{nil}
@ -305,7 +310,7 @@ export NINJA_STATUS="[%f/%t][%e] "
%endif
%changelog
* Wed Sep 22 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.0-1
* Wed Sep 29 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.0-1
- Update to 2.34.0
Related: #1985041
Resolves: #2006423