diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-01-05 14:27:38 -0500 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-01-05 14:27:38 -0500 |
| commit | 333c7e48f519ed71816dae91a9490b8bd3d8b064 (patch) | |
| tree | 20cc03173520041de6fae279cfdb25ab503f0acc /newmoon | |
| parent | fix paths in nm-gcc-11.patch (diff) | |
| download | stackrpms-333c7e48f519ed71816dae91a9490b8bd3d8b064.tar.gz stackrpms-333c7e48f519ed71816dae91a9490b8bd3d8b064.tar.bz2 stackrpms-333c7e48f519ed71816dae91a9490b8bd3d8b064.zip | |
check gcc ver instead of fedora ver
Diffstat (limited to 'newmoon')
| -rw-r--r-- | newmoon/newmoon.spec | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/newmoon/newmoon.spec b/newmoon/newmoon.spec index f122261..2b857e4 100644 --- a/newmoon/newmoon.spec +++ b/newmoon/newmoon.spec @@ -126,15 +126,13 @@ sed -i -r -e '/enable-optimize/s/"\s*$/ -Wno-format-overflow"/' ./.mozconfig %patch1 -p1 %patch2 -p1 %patch3 -p1 -%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 -# For gcc 11 - ls -al - ls -al %{badname} || : - ls -al %{badname}/platform || : +__gccver="$( gcc --version 2>&1 | grep -oE '[0-9]*\.[0-9]\.[0-9]'| head -n1 | grep -oE '^[0-9]+' )" +if test "${__gccver}" == "11" ; then + # For gcc 11 cd platform patch -p1 < %{SOURCE7} cd .. -%endif +fi ! test -d %{badname}/branding/unofficial.unbuilt && { cp -pr %{badname}/branding/unofficial %{badname}/branding/unofficial.unbuilt && \ |