Page MenuHomePhabricator

Backport D79219, D85820, D86134 to 10.0 branch
AbandonedPublic

Authored by bcardiff on Sep 13 2020, 4:55 PM.

Details

Summary

Changes CMake configuration files are backported from master to 10.0 branch.

The 10.0.1 release is a bit broken and affects homebrew https://discourse.brew.sh/t/llvm-config-10-0-1-advertise-libxml2-tbd-as-system-libs/8593

To backport https://reviews.llvm.org/D79219 I needed to go through many commits of changes and revert changes regarding "Simplify CMake handling for zlib".

The other changes included are:

I'm not sure if there are plans for another 10.x release, but since I went through the history to make the patch for homebrew I figure I would send it here also just in case.

Diff Detail

Event Timeline

bcardiff created this revision.Sep 13 2020, 4:55 PM
Herald added projects: Restricted Project, Restricted Project, Restricted Project, Restricted Project. · View Herald TranscriptSep 13 2020, 4:55 PM
Herald added subscribers: llvm-commits, lldb-commits, Restricted Project and 3 others. · View Herald Transcript
bcardiff requested review of this revision.Sep 13 2020, 4:55 PM

D86134 should not be added, it was reverted afterwards. What eventually landed was D85820, which adds a better fix for what D86134 was supposed to solve.

labath added subscribers: tstellar, labath.

@tstellar, who is (was) the release manager for 10.0, can make a definitive call, but our usual modus operandi is to have one point release for each major version. I don't know if this is a sufficiently major issue to break from that (and it definitely is risky).

haampie added a comment.EditedSep 15 2020, 4:10 AM

Also note that the changes are not likely to be backported to 11 even: https://reviews.llvm.org/rG31e5f7120bdd2f76337686d9d169b1c00e6ee69c#942622.

Just glancing at the last commit from 10.0.1, which adds some machinery to remove prefixes / suffixes, can you check if it is enough to just add the get_system_libname function of https://reviews.llvm.org/D85820 instead?

It seems like https://reviews.llvm.org/rGc3595d1069277b4ab0df49d7139b6f1bbc94f21c should have used CMAKE_FIND_LIBRARY_SUFFIXES, which was introduced in https://reviews.llvm.org/D85820; but this differential adds unrelated functionality too.

Also note that the changes are not likely to be backported to 11 even: https://reviews.llvm.org/rG31e5f7120bdd2f76337686d9d169b1c00e6ee69c#942622.

11.0.0, probably. There's should be enough time for 11.0.1, though.

bcardiff abandoned this revision.Fri, Oct 16, 2:07 PM

Closing in favor of D84563