From bbd2d17f8df45b36da1122a0652f3488e374b9b5 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 2 Nov 2020 09:54:46 -0700 Subject: [PATCH] Fix invalid use of volatile caught by gcc-11 --- rpm-ostree-gcc11.patch | 13 +++++++++++++ rpm-ostree.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 rpm-ostree-gcc11.patch diff --git a/rpm-ostree-gcc11.patch b/rpm-ostree-gcc11.patch new file mode 100644 index 0000000..307b951 --- /dev/null +++ b/rpm-ostree-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c +index 7b160e4..af48122 100644 +--- a/src/daemon/rpmostree-sysroot-upgrader.c ++++ b/src/daemon/rpmostree-sysroot-upgrader.c +@@ -1712,7 +1712,7 @@ rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self, + GType + rpmostree_sysroot_upgrader_flags_get_type (void) + { +- static volatile gsize g_define_type_id__volatile = 0; ++ static gsize g_define_type_id__volatile = 0; + + if (g_once_init_enter (&g_define_type_id__volatile)) + { diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 02a34e9..e83cad4 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -4,12 +4,13 @@ Summary: Hybrid image/package system Name: rpm-ostree Version: 2020.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: https://github.com/coreos/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # in the upstream git. If rust is enabled, it contains vendored sources. Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz +Patch0: %{name}-gcc11.patch ExclusiveArch: %{rust_arches} @@ -193,6 +194,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Mon Nov 02 2020 Jeff Law - 2020.6-2 +- Fix invalid use of volatile caught by gcc-11 + * Fri Oct 30 16:48:43 UTC 2020 Colin Walters - 2020.6-1 - https://github.com/coreos/rpm-ostree/releases/tag/v2020.6