From fcbe43948ffc58fe54a0559daa772b8fe0045fa6 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Fri, 20 Nov 2020 11:15:06 -0500 Subject: [PATCH] fix el7 and el8 --- chromium-87.0.4280.66-el7-no-sys-random.patch | 13 +++++++++++++ chromium.spec | 7 +++++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 chromium-87.0.4280.66-el7-no-sys-random.patch diff --git a/chromium-87.0.4280.66-el7-no-sys-random.patch b/chromium-87.0.4280.66-el7-no-sys-random.patch new file mode 100644 index 00000000..7a0f7ab5 --- /dev/null +++ b/chromium-87.0.4280.66-el7-no-sys-random.patch @@ -0,0 +1,13 @@ +diff -up chromium-87.0.4280.66/base/rand_util_posix.cc.el7 chromium-87.0.4280.66/base/rand_util_posix.cc +--- chromium-87.0.4280.66/base/rand_util_posix.cc.el7 2020-11-20 11:11:22.169119495 -0500 ++++ chromium-87.0.4280.66/base/rand_util_posix.cc 2020-11-20 11:13:30.375614387 -0500 +@@ -21,7 +21,8 @@ + #include "third_party/lss/linux_syscall_support.h" + #endif + +-#if !defined(OS_IOS) && !defined(OS_NACL) ++//EL-7 is too old to have this header ++#if 0 + // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. + // (See below.) + #include diff --git a/chromium.spec b/chromium.spec index 4ed406d5..8442e88b 100644 --- a/chromium.spec +++ b/chromium.spec @@ -283,10 +283,12 @@ Patch106: chromium-77-clang.patch # ARM failures on el8 related to int clashes # error: incompatible types when initializing type 'int64_t' {aka 'long int'} using type 'int64x1_t' # note: expected 'int8x16_t' but argument is of type 'uint8x16_t' -Patch107: chromium-84.0.4147.89-el8-arm-incompatible-ints.patch +# Patch107: chromium-84.0.4147.89-el8-arm-incompatible-ints.patch # libdrm on EL7 is rather old and chromium assumes newer # This gets us by for now Patch108: chromium-85.0.4183.83-el7-old-libdrm.patch +# EL-7 does not have sys/random.h +Patch109: chromium-87.0.4280.66-el7-no-sys-random.patch # VAAPI # Upstream turned VAAPI on in Linux in 86 @@ -897,10 +899,11 @@ udev. %patch103 -p1 -b .epel7-kcmp %patch104 -p1 -b .el7cups %patch108 -p1 -b .el7-old-libdrm +%patch109 -p1 -b .el7-no-sys-random %endif %if 0%{?rhel} == 8 -%patch107 -p1 -b .el8-arm-incompatible-ints +# %%patch107 -p1 -b .el8-arm-incompatible-ints %endif # Feature specific patches