Skip to content

Disable brotli support feature in Freetype (not only on Apple)#11242

Merged
bellenot merged 2 commits intoroot-project:masterfrom
bellenot:disable-brotli
Aug 24, 2022
Merged

Disable brotli support feature in Freetype (not only on Apple)#11242
bellenot merged 2 commits intoroot-project:masterfrom
bellenot:disable-brotli

Conversation

@bellenot
Copy link
Copy Markdown
Member

Should fix #11239

@bellenot bellenot self-assigned this Aug 23, 2022
@phsft-bot
Copy link
Copy Markdown

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

Copy link
Copy Markdown
Member

@hahnjo hahnjo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM; FWIW disabling brotli was only done conditionally with if (APPLE) by #10770, no mention of a reason.

set(_freetype_zlib --without-zlib)
endif()
if (APPLE)
#if (APPLE)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the condition instead of commenting out

@phsft-bot
Copy link
Copy Markdown

Starting build on ROOT-debian10-i386/soversion, ROOT-performance-centos8-multicore/cxx17, ROOT-ubuntu18.04/nortcxxmod, ROOT-ubuntu2004/python3, mac1015/cxx17, mac11/cxx14, windows10/cxx14
How to customize builds

@bellenot bellenot merged commit 1089942 into root-project:master Aug 24, 2022
@bellenot bellenot deleted the disable-brotli branch August 24, 2022 09:26
bellenot added a commit to bellenot/root that referenced this pull request Aug 24, 2022
…project#11242)

* Disable brotli support feature in Freetype (not only on Apple)

Should fix root-project#11239

* Remove code instead of commenting it out
bellenot added a commit that referenced this pull request Aug 24, 2022
… (#11247)

* Disable brotli support feature in Freetype (not only on Apple)

Should fix #11239

* Remove code instead of commenting it out
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Build failure on Ubuntu22.04, when ROOT builds FTGL itself

3 participants