diff mbox series

harfbuzz: remove meson flag work-around

Message ID 20250425174215.19853-1-twoerner@gmail.com
State New
Headers show
Series harfbuzz: remove meson flag work-around | expand

Commit Message

Trevor Woerner April 25, 2025, 5:42 p.m. UTC
The issue is committed and resolved upstream, therefore remove the
work-around of explicitly having to set the meson flag 'cpp_std=c++17' when
using icu >= 75.

https://github.com/harfbuzz/harfbuzz/issues/4671
https://github.com/harfbuzz/harfbuzz/pull/4734

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb | 3 ---
 1 file changed, 3 deletions(-)

Comments

Richard Purdie April 26, 2025, 8:44 a.m. UTC | #1
On Fri, 2025-04-25 at 13:42 -0400, Trevor Woerner via lists.openembedded.org wrote:
> The issue is committed and resolved upstream, therefore remove the
> work-around of explicitly having to set the meson flag 'cpp_std=c++17' when
> using icu >= 75.
> 
> https://github.com/harfbuzz/harfbuzz/issues/4671
> https://github.com/harfbuzz/harfbuzz/pull/4734
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
> index 8945467a001d..2febcbecda31 100644
> --- a/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
> +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
> @@ -32,9 +32,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.
> 

Removing this caused failures on the autobuilder with gcc 15 e.g.:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/2/builds/1474

but there were more in that build.

Cheers,

Richard
Richard Purdie April 26, 2025, 9:45 a.m. UTC | #2
On Sat, 2025-04-26 at 09:44 +0100, Richard Purdie via lists.openembedded.org wrote:
> On Fri, 2025-04-25 at 13:42 -0400, Trevor Woerner via lists.openembedded.org wrote:
> > The issue is committed and resolved upstream, therefore remove the
> > work-around of explicitly having to set the meson flag 'cpp_std=c++17' when
> > using icu >= 75.
> > 
> > https://github.com/harfbuzz/harfbuzz/issues/4671
> > https://github.com/harfbuzz/harfbuzz/pull/4734
> > 
> > Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> > ---
> >  meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
> > index 8945467a001d..2febcbecda31 100644
> > --- a/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
> > +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
> > @@ -32,9 +32,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.
> > 
> 
> Removing this caused failures on the autobuilder with gcc 15 e.g.:
> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/2/builds/1474
> 
> but there were more in that build.

I did drop this patch and I think we still see the same failure with
gcc 15 so there may be more to this...

Cheers,

Richard
diff mbox series

Patch

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
index 8945467a001d..2febcbecda31 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_11.0.1.bb
@@ -32,9 +32,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.