mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 12:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

harfbuzz: Fix build with gcc-15

Browse Source 
GCC-15 inliner at O2 seems to be able to analyse more
This is a workaround to compile the one file where it fails
to use -Os

(From OE-Core rev: 01f2b3f09c3c9999e75f15c9041a0668cb6bb580)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2025-04-28 10:02:43 -07:00
committed by Richard Purdie
parent 62c4daafce
commit 781d7b2082
2 changed files with 73 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
meta/recipes-graphics/harfbuzz/harfbuzz/0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch Normal file
View File

@@ -0,0 +1,72 @@
From 8d876ea19579ee6b687668921c17be423cf7d6c2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sun, 27 Apr 2025 15:26:09 -0700
Subject: [PATCH] Use -Os to compile hb-subset-plan-layout.cc
This helps compiling with GCC 15
Reported upstream with GH Issues [1]
[1] https://github.com/harfbuzz/harfbuzz/issues/5306
Upstream-Status: Inappropriate [GCC-15 workaround]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/meson.build | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 3d1c00d..fded728 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -393,7 +393,6 @@ hb_subset_sources = files(
'hb-subset-instancer-solver.hh',
'hb-subset-instancer-solver.cc',
'hb-subset-plan.cc',
- 'hb-subset-plan-layout.cc',
'hb-subset-plan-var.cc',
'hb-subset-plan.hh',
'hb-subset-plan-member-list.hh',
@@ -410,6 +409,10 @@ hb_subset_sources = files(
'hb-subset.hh',
)
+hb_subset_sources_os = files(
+ 'hb-subset-plan-layout.cc',
+)
+
hb_subset_headers = files(
'hb-subset.h',
'hb-subset-serialize.h'
@@ -618,6 +621,12 @@ endif
darwin_versions = [hb_version_int, '@0@.0.0'.format(hb_version_int)]
+special_subset_layout_lib = static_library('special_subset_layout',
+ 'hb-subset-plan-layout.cc',
+ include_directories: incconfig,
+ cpp_args: cpp_args + extra_hb_cpp_args + ['-Os'], # <== compile this one with -Os
+)
+
libharfbuzz = library('harfbuzz', hb_sources,
include_directories: incconfig,
dependencies: harfbuzz_deps,
@@ -645,7 +654,7 @@ defs_list += [harfbuzz_subset_def]
libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
include_directories: incconfig,
dependencies: [m_dep],
- link_with: [libharfbuzz],
+ link_with: [libharfbuzz] + [special_subset_layout_lib],
cpp_args: cpp_args + extra_hb_cpp_args,
soversion: hb_so_version,
version: version,
@@ -657,7 +666,7 @@ libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources,
custom_target('harfbuzz-subset.cc',
build_by_default: true,
output: 'harfbuzz-subset.cc',
- input: hb_base_sources + hb_subset_sources,
+ input: hb_base_sources + hb_subset_sources + hb_subset_sources_os,
command: [find_program('gen-harfbuzzcc.py'),
'@OUTPUT@', meson.current_source_dir(), '@INPUT@'],
)

4
meta/recipes-graphics/harfbuzz/harfbuzz_11.1.0.bb
View File

@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \
"
SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz"
SRC_URI += "file://0001-Use-Os-to-compile-hb-subset-plan-layout.cc.patch"
SRC_URI[sha256sum] = "477f0d48c34dc32093b45304178eb9733361ca1832b5159879c99e6d40227969"
DEPENDS += "glib-2.0-native"
@@ -32,9 +33,6 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset"
LEAD_SONAME = "libharfbuzz.so"
# Remove when https://github.com/harfbuzz/harfbuzz/issues/4671 is resolved
EXTRA_OEMESON += "-Dcpp_std=c++17"
do_install:append() {
# If no tools are installed due to PACKAGECONFIG then this directory might
# still be installed, so remove it to stop packaging warnings.