Skip to content

update river and waylock#43143

Merged
paper42 merged 2 commits into
void-linux:masterfrom
dkwo:river
Apr 6, 2023
Merged

update river and waylock#43143
paper42 merged 2 commits into
void-linux:masterfrom
dkwo:river

Conversation

@dkwo
Copy link
Copy Markdown
Contributor

@dkwo dkwo commented Mar 31, 2023 •
edited
Loading

  • I tested the changes in this PR: yes. been running them for months, built with zig-static
  • I built this PR locally for my native architecture, (x86_64-musl)

@icp1994
Copy link
Copy Markdown
Member

icp1994 commented Mar 31, 2023

oof...building LLVM/Zig in CI

@icp1994
Copy link
Copy Markdown
Member

icp1994 commented Mar 31, 2023

I checked with the local template for river I had, noticed these two differences

  • no -Drelease-safe (it's enforced by the zig build style)
  • libxkbcommon-devel & wayland-devel in makdepends (I read somewhere wayland-devel is needed in both host & target sometimes)

@dkwo
Copy link
Copy Markdown
Contributor Author

dkwo commented Mar 31, 2023

I wonder if by now it is acceptable to drop build_options_default="xwayland"..

ifreund
ifreund reviewed Mar 31, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@ifreund ifreund left a comment

Choose a reason for hiding this comment

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

Crazy that void finally has LLVM 15!

Thanks for updating these :)

Comment thread srcpkgs/river/template Outdated
Comment thread srcpkgs/river/template
Comment thread srcpkgs/waylock/template Outdated
Comment thread srcpkgs/waylock/template Outdated
Comment thread srcpkgs/river/template Outdated
@classabbyamp
Copy link
Copy Markdown
Member

classabbyamp commented Apr 1, 2023

make sure to rebase and remove the broken= in river, that was temporary to get the builders to finish with llvm

@ifreund
Copy link
Copy Markdown
Contributor

ifreund commented Apr 1, 2023

(The broken= was added due to build issues on 32 bit arm targets, which should likely be disabled)

@dkwo
Copy link
Copy Markdown
Contributor Author

dkwo commented Apr 1, 2023 •
edited
Loading

should i restrict arch? maybe ~armv6l* ~armv7l* ~i686* ?

@classabbyamp
Copy link
Copy Markdown
Member

classabbyamp commented Apr 1, 2023

should i restrict arch? maybe ~armv6l* ~armv7l* ~i686* ?

maybe replace the conditional around the broken with "$XBPS_TARGET_WORD_SIZE" = 32

@icp1994
Copy link
Copy Markdown
Member

icp1994 commented Apr 1, 2023

I thought since Zig template has archs="x86_64* aarch64*", river would have that implied. Isn't that how electron packages work too? Can someone ELI5 a bit?

@classabbyamp
Copy link
Copy Markdown
Member

classabbyamp commented Apr 1, 2023

it's hostmakedepends

@dkwo
Copy link
Copy Markdown
Contributor Author

dkwo commented Apr 2, 2023

is the repository syncing correctly by now, or should i wait to rebase this?

@paper42
Copy link
Copy Markdown
Member

paper42 commented Apr 2, 2023 •
edited
Loading

is the repository syncing correctly by now, or should i wait to rebase this?

CI repository was switched to repo-de for now, so it will work

EDIT: it's back on repo-fi which is syncing now

@dkwo
Copy link
Copy Markdown
Contributor Author

dkwo commented Apr 3, 2023

ready to merge imho

@jcgruenhage jcgruenhage mentioned this pull request Apr 4, 2023
Closed
@paper42 paper42 merged commit 6cedd2f into void-linux:master Apr 6, 2023
@dkwo dkwo deleted the river branch May 16, 2023 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@paper42 paper42 paper42 left review comments

+1 more reviewer

@ifreund ifreund ifreund approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@dkwo @icp1994 @classabbyamp @ifreund @paper42