[go: up one dir, main page]

Bug 274896 - devel/wasi-*: add WASI ports for newer LLVMs
Summary: devel/wasi-*: add WASI ports for newer LLVMs
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Charlie Li
URL:
Keywords:
: 266319 266340 266341 266342 (view as bug list)
Depends on:
Blocks:
 
Reported: 2023-11-04 03:43 UTC by Eric Camachat
Modified: 2023-11-20 21:35 UTC (History)
2 users (show)

See Also:
vishwin: maintainer-feedback+
vishwin: maintainer-feedback-


Attachments
Update WASI (278.97 KB, patch)
2023-11-04 03:43 UTC, Eric Camachat
vishwin: maintainer-approval-
Details | Diff
refactored (320.93 KB, patch)
2023-11-08 02:20 UTC, Eric Camachat
eric: maintainer-approval-
eric: maintainer-approval-
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Camachat 2023-11-04 03:43:16 UTC
Created attachment 246091 [details]
Update WASI
Comment 1 Eric Camachat 2023-11-04 03:44:39 UTC
*** Bug 266319 has been marked as a duplicate of this bug. ***
Comment 2 Eric Camachat 2023-11-04 03:45:30 UTC
*** Bug 266340 has been marked as a duplicate of this bug. ***
Comment 3 Eric Camachat 2023-11-04 03:45:52 UTC
*** Bug 266341 has been marked as a duplicate of this bug. ***
Comment 4 Eric Camachat 2023-11-04 03:46:18 UTC
*** Bug 266342 has been marked as a duplicate of this bug. ***
Comment 5 Charlie Li freebsd_committer freebsd_triage 2023-11-04 03:47:46 UTC
Comment on attachment 246091 [details]
Update WASI

Please see and use review D40098 instead, as mentioned in other bugs covering this subject. There are a number of things that I don't approve of in this patch, particularly code duplication and unnecessary fixed versioning.
Comment 6 Charlie Li freebsd_committer freebsd_triage 2023-11-04 03:52:12 UTC
Formally pinging gecko@ on here for the bsd.gecko.mk bits on review D40098, which has been the primary approval blocker since the beginning of my work here since they are the main consumer and very sensitive to how this is configured and built.
Comment 7 Eric Camachat 2023-11-08 02:20:09 UTC
Created attachment 246189 [details]
refactored

Refatored devel/wasi-* ports, use master / slave ports for easier maintain.
Comment 8 Eric Camachat 2023-11-08 02:21:43 UTC
(In reply to Charlie Li from comment #5)
I will take a look, thanks.
Comment 9 Eric Camachat 2023-11-08 02:32:50 UTC
Comment on attachment 246189 [details]
refactored

D40098 in progess
Comment 10 Charlie Li freebsd_committer freebsd_triage 2023-11-20 21:08:20 UTC
maintainer-feedback timeout on gecko@ (more than two weeks)
Comment 11 commit-hook freebsd_committer freebsd_triage 2023-11-20 21:33:52 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e38b3857f20acc9b1db1f0e2faf416c7b46e73a8

commit e38b3857f20acc9b1db1f0e2faf416c7b46e73a8
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2023-11-20 21:29:34 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
CommitDate: 2023-11-20 21:32:36 +0000

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

    wasi-libcxx and wasi-compiler-rt now meta ports (similar to u-boot);
    the build process is the same for each LLVM version so child ports
    are minimal. Minimum supported LLVM version is 12, thus its
    corresponding child ports are resurrected and LLVM 11 child ports
    are removed.

    Since all supported LLVM versions are made available at once, remove
    restriction in bsd.gecko.mk and switch to USES=llvm throughout. LTO
    on gecko ports should now work with later LLVM versions so long as
    ${DEFAULT_VERSIONS} is set properly and matches the LLVM used in
    rust (if not using the PORT_LLVM option).

    Reviewed by: brooks (LLVM ports interactions)
    Tested by: Eric Camachat <eric[at]camachat[dot]org>
    Approved by: maintainer timeout (gecko@ portion, 2+ weeks)
    PR: 274896
    Differential Revision: https://reviews.freebsd.org/D40098

 MOVED                                              |    2 +-
 Mk/bsd.gecko.mk                                    |   24 +-
 devel/Makefile                                     |   13 +-
 devel/wasi-compiler-rt/Makefile (new)              |   70 ++
 .../pkg-descr                                      |    0
 devel/wasi-compiler-rt11/Makefile (gone)           |   63 --
 devel/wasi-compiler-rt11/distinfo (gone)           |    3 -
 devel/wasi-compiler-rt12/Makefile (new)            |    6 +
 devel/wasi-compiler-rt13/Makefile                  |   60 +-
 devel/wasi-compiler-rt13/distinfo (gone)           |    3 -
 devel/wasi-compiler-rt13/pkg-descr (gone)          |    5 -
 devel/wasi-compiler-rt14/Makefile (new)            |    6 +
 devel/wasi-compiler-rt15/Makefile (new)            |    6 +
 devel/wasi-compiler-rt16/Makefile (new)            |    6 +
 devel/wasi-compiler-rt17/Makefile (new)            |    6 +
 devel/wasi-libc/Makefile                           |   27 +-
 devel/wasi-libc/distinfo                           |   10 +-
 devel/wasi-libc/files/patch-Makefile (gone)        |   13 -
 devel/wasi-libcxx/Makefile                         |  155 +--
 devel/wasi-libcxx/distinfo (gone)                  |    3 -
 devel/wasi-libcxx12/Makefile (new)                 |    6 +
 devel/wasi-libcxx12/pkg-plist (new)                |  191 ++++
 devel/wasi-libcxx13/Makefile (new)                 |    6 +
 devel/{wasi-libcxx => wasi-libcxx13}/pkg-plist     |    0
 devel/wasi-libcxx14/Makefile (new)                 |    6 +
 devel/wasi-libcxx14/pkg-plist (new)                |  544 +++++++++++
 devel/wasi-libcxx15/Makefile (new)                 |    6 +
 devel/wasi-libcxx15/pkg-plist (new)                |  795 +++++++++++++++
 devel/wasi-libcxx16/Makefile (new)                 |    6 +
 devel/wasi-libcxx16/pkg-plist (new)                |  877 +++++++++++++++++
 devel/wasi-libcxx17/Makefile (new)                 |    6 +
 devel/wasi-libcxx17/pkg-plist (new)                | 1017 ++++++++++++++++++++
 mail/thunderbird/Makefile                          |    4 +-
 www/firefox-esr/Makefile                           |    4 +-
 www/firefox/Makefile                               |    4 +-
 www/librewolf/Makefile                             |    8 +-
 www/tor-browser/Makefile                           |    4 +-
 37 files changed, 3655 insertions(+), 310 deletions(-)
Comment 12 Charlie Li freebsd_committer freebsd_triage 2023-11-20 21:35:34 UTC
Committed; please report any further issues if they come up.