Fix build failure on armv7hl architecture
This commit is contained in:
parent
5fd42448fa
commit
c92682080d
@ -0,0 +1,33 @@
|
||||
From 07dc34bdaf977a3be97ab5a68455ed7a67f80a06 Mon Sep 17 00:00:00 2001
|
||||
From: Behdad Esfahbod <behdad@behdad.org>
|
||||
Date: Fri, 5 Nov 2021 14:45:20 -0700
|
||||
Subject: [PATCH] [mutex] Try work around GCC cast-align error/warning
|
||||
|
||||
Shouldn't be needed because of the alignas(). Oh well...
|
||||
|
||||
Might fix https://github.com/harfbuzz/harfbuzz/issues/3283
|
||||
---
|
||||
src/hb-mutex.hh | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/hb-mutex.hh b/src/hb-mutex.hh
|
||||
index 4e135027f..6914b2245 100644
|
||||
--- a/src/hb-mutex.hh
|
||||
+++ b/src/hb-mutex.hh
|
||||
@@ -97,10 +97,13 @@ struct hb_mutex_t
|
||||
/* Create space for, but do not initialize m. */
|
||||
alignas(hb_mutex_impl_t) char m[sizeof (hb_mutex_impl_t)];
|
||||
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wcast-align"
|
||||
void init () { hb_mutex_impl_init ((hb_mutex_impl_t *) m); }
|
||||
void lock () { hb_mutex_impl_lock ((hb_mutex_impl_t *) m); }
|
||||
void unlock () { hb_mutex_impl_unlock ((hb_mutex_impl_t *) m); }
|
||||
void fini () { hb_mutex_impl_finish ((hb_mutex_impl_t *) m); }
|
||||
+#pragma GCC diagnostic pop
|
||||
};
|
||||
|
||||
struct hb_lock_t
|
||||
--
|
||||
2.32.0
|
||||
|
@ -1,12 +1,15 @@
|
||||
Name: harfbuzz
|
||||
Version: 3.1.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Text shaping library
|
||||
|
||||
License: MIT
|
||||
URL: https://harfbuzz.github.io/
|
||||
Source0: https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz
|
||||
|
||||
# Upstream patches
|
||||
Patch0: 0001-mutex-Try-work-around-GCC-cast-align-error-warning.patch
|
||||
|
||||
BuildRequires: cairo-devel
|
||||
BuildRequires: freetype-devel
|
||||
BuildRequires: glib2-devel
|
||||
@ -88,6 +91,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
%{_libdir}/libharfbuzz-icu.so.*
|
||||
|
||||
%changelog
|
||||
* Sat Nov 06 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.1.0-2
|
||||
- Fix build failure on armv7hl architecture
|
||||
|
||||
* Fri Nov 05 2021 Parag Nemade <pnemade AT redhat DOT com> - 3.1.0-1
|
||||
- Update to 3.1.0 version (#2020154)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user