Skip to content

Conversation

@AiraYumi
Copy link
Contributor

@AiraYumi AiraYumi commented Apr 6, 2024

We plan to make some fixes in this RP.

This is currently a work in progress and the PR may be discarded, so it will be drafted.

@github-actions github-actions bot added the cmake label Apr 6, 2024
@AiraYumi
Copy link
Contributor Author

AiraYumi commented Apr 6, 2024

@Nicky-D / @marchcat / @bennettgoble / @nat-goodspeed
Do I need to enable tracy in build_linux.yaml? for testing.

@AiraYumi
Copy link
Contributor Author

AiraYumi commented Apr 6, 2024

remove change for cef.

@github-actions github-actions bot added the python label Apr 6, 2024
fltk
Xrender
Xcursor
Xfixes
Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you for adding that. After this, it should be possible to drop llibfltk1.3-dev from .github/workflows/build_linux.yaml

@AiraYumi
Copy link
Contributor Author

AiraYumi commented Apr 6, 2024

After #1146 is merged, pull the changes into this PR.

@AiraYumi
Copy link
Contributor Author

AiraYumi commented Apr 6, 2024

We will move from Draft to a normal pull request, but if we want to merge this PR, we would like to do it after incorporating the changes made after #1146 was merged.

@AiraYumi AiraYumi marked this pull request as ready for review April 6, 2024 11:34
@bennettgoble
Copy link
Contributor

bennettgoble commented Apr 6, 2024

Hi, @AiraYumi. Thank you for the PR. Could you please remove any work that has already been merged into other Linden branchs (example: #1054 etc.)? We will take care of merging work between release vehicles and don't need it to be re-applied.

Copy link
Contributor

@bennettgoble bennettgoble left a comment

Choose a reason for hiding this comment

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

PR needs already-merged work removed.

@AiraYumi
Copy link
Contributor Author

AiraYumi commented Apr 6, 2024

Removed existing merge.
Once you have updated to the latest expat build and confirmed that it can be built, there is no problem with merging.

@AiraYumi
Copy link
Contributor Author

AiraYumi commented Apr 6, 2024

3p-libraries bump complete.

build testing.


if(LINUX)
list(APPEND GCC_WARNINGS -Wno-maybe-uninitialized -Wno-misleading-indentation -Wno-stringop-truncation -Wno-unused-value )
list(APPEND GCC_WARNINGS -Wno-maybe-uninitialized -Wno-dangling-pointer )
Copy link
Contributor

Choose a reason for hiding this comment

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

Where did you encounter this issue. I have not been able to reproduce with
gcc version 13.2.1 20240210 (Gentoo 13.2.1_p20240210 p14)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The problem occurs when bumping boost to 1.84.
It does not occur now and can be removed, but it will occur if you update to 1.84 in the future, so you will need to fix it anyway.

Copy link
Contributor

Choose a reason for hiding this comment

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

Got it. We shall look at it again when then time comes. Maybe there's another way to get rid of the warning without having to disable it on the whole code base

@AiraYumi
Copy link
Contributor Author

AiraYumi commented Apr 6, 2024

The build completed successfully in my local repository.
It worked fine with gcc13, so it's probably fine with gcc12 as well.
If there is no problem, please merge.

@AiraYumi AiraYumi requested a review from bennettgoble April 7, 2024 02:37
@marchcat marchcat self-requested a review April 8, 2024 12:55
Copy link
Contributor

@marchcat marchcat left a comment

Choose a reason for hiding this comment

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

LGTM,
Thank you!

autobuild.xml Outdated
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.1.1.1f36d02/expat-2.1.1.1f36d02-linux64-1f36d02.tar.zst</string>
<string>https://github.com/secondlife/3p-expat/releases/download/v2.6.2-r3/expat-2.6.2-r3-linux64-8583963182.tar.zst</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like you're updating expat, but only on linux. We generally try to update all platforms at once, and I have been working on that here: #1078 Could you remove the autobuild.xml changes that are being worked on under #1078?

@github-actions github-actions bot removed the python label Apr 8, 2024
@AiraYumi AiraYumi requested a review from bennettgoble April 8, 2024 15:48
@AiraYumi
Copy link
Contributor Author

AiraYumi commented Apr 8, 2024

I removed the expat update.

@marchcat marchcat merged commit bbd6dfc into secondlife:release/maint-b Apr 8, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Apr 8, 2024
@AiraYumi AiraYumi deleted the feature/maint-b branch April 9, 2024 00:41
@marchcat marchcat added this to the Maintenance B milestone Apr 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants