Details

Reviewers

freebsd_sysctl.cz
brooks

Group Reviewers

gecko
portmgr

Commits

R11:e38b3857f20a: wasi: update libc to sdk-20 and modularise LLVM bits

Summary

Update wasi-libc to sdk-19, with patch to null out bulk memory opcodes that the mozilla-{release,esr} codebase fails to build with.

wasi-libcxx and wasi-compiler-rt now meta ports; the build process is the same for each LLVM version so child ports are minimal. Flavours don't work here due to differing LLVM versions between them. Note that LLVM 16 changed the directory hierarchy to major version only, so cannot use exact file references for the wasi-compiler-rt dependency line any longer.

Since all supported LLVM versions are made available at once, remove restriction in bsd.gecko.mk. While here switch to USES=llvm throughout, max version limited to 15 for now (see below).

Test Plan

Dogfooded with both LLVM 14 and 15. 16 made available but gecko-ESR-based ports don't build because outdated proc-macro2 crate, and runtime crashes being investigated on mozilla-release (www/firefox). Once mozilla-release is fixed, LLVM 15 max restriction can go away but need to remain in ESR only until crate(s) are updated.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 51494
Build 48385: arc lint + arc unit

Event Timeline

vishwin created this revision.May 14 2023, 10:07 PM

Herald added a reviewer: portmgr. · View Herald TranscriptMay 14 2023, 10:07 PM

Herald added a subscriber: mat. · View Herald Transcript

vishwin requested review of this revision.May 14 2023, 10:07 PM

Harbormaster completed remote builds in B51492: Diff 121945.May 14 2023, 10:08 PM

MOVED: add forgotten devel/wasi-compiler-rt11

12 is the minimum supported LLVM version.

Harbormaster completed remote builds in B51493: Diff 121946.May 14 2023, 10:12 PM

vishwin mentioned this in D35286: devel/wasi-libc: update to g20220509.May 14 2023, 10:14 PM

vishwin mentioned this in D35288: devel/wasi-compiler-rt14: new port.

vishwin mentioned this in D35287: devel/wasi-libcxx: update to 14.0.6.

vishwin mentioned this in D35289: www/firefox: update/rework WASI logic.

www/librewolf: adjust WASI dependencies

Harbormaster completed remote builds in B51494: Diff 121947.May 14 2023, 10:25 PM

This feels like flavors might make sense instead of the shared pseudo ports, but seems fine as is. I might give the pseudo ports a nonstandard directory name to highlight that they are aren't really ports (e.g., devel/_wasi-libcxx or devel/.wasi-libcxx).

devel/wasi-libc: update to wasi-sdk-20
devel/wasi-{compiler-rt,libcxx}16: sync with devel/llvm16
devel/wasi-libcxx: fix LICENSE_FILE location
bsd.gecko.mk: remove LLVM version restriction

Note that bulk memory opcodes continue to need null out until gecko 115/ESR is released, see Mozilla bug 1831980.

Harbormaster completed remote builds in B52124: Diff 123382.Jun 18 2023, 3:28 AM

vishwin retitled this revision from wasi: update libc to sdk-19 and modularise LLVM bits to wasi: update libc to sdk-20 and modularise LLVM bits.Jun 18 2023, 3:29 AM

MOVED: remove stray conflict mark

Harbormaster completed remote builds in B52125: Diff 123383.Jun 18 2023, 3:30 AM

gecko-esr: limit to LLVM 15 due to old proc-macro2 crate

Harbormaster completed remote builds in B52129: Diff 123393.Jun 18 2023, 2:50 PM

devel/wasi-{compiler-rt,libcxx}16: sync with devel/llvm16 16.0.6

Harbormaster completed remote builds in B52147: Diff 123456.Jun 19 2023, 11:19 PM

bad arc bad

Harbormaster completed remote builds in B52148: Diff 123457.Jun 19 2023, 11:19 PM

• grahamperrin added a subscriber: • grahamperrin.Jun 21 2023, 6:18 AM

osa added a subscriber: osa.Jul 31 2023, 1:56 PM

update/add LLVM 17 support/pieces

Harbormaster completed remote builds in B53723: Diff 127812.Sep 26 2023, 3:24 AM

osa awarded a token.Sep 28 2023, 4:24 PM

arrowd added a subscriber: arrowd.Oct 9 2023, 10:58 AM

arrowd added inline comments.

devel/wasi-libc/Makefile
32	This now is not needed anymore, I guess? `USES=llvm` exports CC/CXX by default unless `noexport` is specified.

devel/wasi-{compiler-rt,libcxx}17: sync to 17.0.3
Revert "gecko-esr: limit to LLVM 15 due to old proc-macro2 crate"

Harbormaster completed remote builds in B54158: Diff 129366.Oct 24 2023, 10:14 PM

devel/wasi-libc: remove extra ${CC} after USES=llvm default export

Harbormaster completed remote builds in B54159: Diff 129367.Oct 24 2023, 10:27 PM

remove stray conflict artefact

Harbormaster completed remote builds in B54160: Diff 129369.Oct 24 2023, 10:32 PM

In general this seems fine. I do find myself wondering why it's necessary or useful to have the versioned packages conflict with each other by installing in share/wasi-sysroot instead of share/wasi-sysroot${LLVM_VERSION}.

devel/Makefile
7685–7686	Is there any sense in hooking this up?
devel/wasi-libcxx17/Makefile
2 ↗	(On Diff #129369)

eric_camachat.org added a subscriber: eric_camachat.org.Nov 9 2023, 3:38 AM

eric_camachat.org added inline comments.

devel/wasi-compiler-rt/Makefile
32–33	For some reason, it also need WITHOUT_CPU_CFLAGS=yes on my machine.
devel/wasi-compiler-rt17/Makefile
2 ↗	(On Diff #129369)
devel/wasi-libcxx/Makefile
33–34	For some reason, it also need WITHOUT_CPU_CFLAGS=yes on my machine.

vishwin added inline comments.Nov 17 2023, 11:54 PM

devel/Makefile
7685–7686	Will probably get an earful about breaking INDEX otherwise?
devel/wasi-compiler-rt/Makefile
32–33	Do you have CPU flags set in your `make.conf`?

devel/wasi-{compiler-rt,libcxx}17: sync to 17.0.5

Harbormaster completed remote builds in B54504: Diff 130285.Nov 18 2023, 12:00 AM

phab...

Harbormaster completed remote builds in B54505: Diff 130286.Nov 18 2023, 12:04 AM

eric_camachat.org added inline comments.Nov 18 2023, 3:41 AM

devel/wasi-compiler-rt/Makefile
32–33	Yes, I have CPU flags in `make.conf`

devel/wasi-{compiler-rt,libcxx}: add WITHOUT_CPU_CFLAGS
devel/wasi-libc: remove BULK_MEMORY_SOURCES omission, all gecko now supports those opcodes

Harbormaster completed remote builds in B54523: Diff 130342.Nov 20 2023, 6:34 PM

another stray conflict mark

Harbormaster completed remote builds in B54524: Diff 130343.Nov 20 2023, 6:38 PM

vishwin marked 3 inline comments as done.Nov 20 2023, 6:39 PM

bsd.gecko.mk: add :noexport to USES=llvm, for any GCC cases

Harbormaster completed remote builds in B54525: Diff 130349.Nov 20 2023, 8:00 PM

Committed but the auto-close didn't work

wasi: update libc to sdk-20 and modularise LLVM bitsAbandonedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 121947

MOVED

Mk/bsd.gecko.mk

devel/Makefile

devel/wasi-compiler-rt/Makefile

devel/wasi-compiler-rt/pkg-descr

devel/wasi-compiler-rt11/Makefile

devel/wasi-compiler-rt11/distinfo

devel/wasi-compiler-rt11/pkg-descr

devel/wasi-compiler-rt12/Makefile

devel/wasi-compiler-rt13/Makefile

devel/wasi-compiler-rt13/distinfo

devel/wasi-compiler-rt13/pkg-descr

devel/wasi-compiler-rt14/Makefile

devel/wasi-compiler-rt15/Makefile

devel/wasi-compiler-rt16/Makefile

devel/wasi-libc/Makefile

devel/wasi-libc/distinfo

devel/wasi-libc/files/patch-Makefile

devel/wasi-libcxx/Makefile

devel/wasi-libcxx/distinfo

devel/wasi-libcxx/pkg-plist

devel/wasi-libcxx12/Makefile

devel/wasi-libcxx12/pkg-plist

devel/wasi-libcxx13/Makefile

devel/wasi-libcxx13/pkg-plist

devel/wasi-libcxx14/Makefile

devel/wasi-libcxx14/pkg-plist

devel/wasi-libcxx15/Makefile

devel/wasi-libcxx15/pkg-plist

devel/wasi-libcxx16/Makefile

devel/wasi-libcxx16/pkg-plist

mail/thunderbird/Makefile

www/firefox-esr/Makefile

www/firefox/Makefile

www/librewolf/Makefile

www/tor-browser/Makefile

wasi: update libc to sdk-20 and modularise LLVM bits
AbandonedPublic
Actions

Revision Contents
Changeset List