Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update baseline to resolve file conflicts with nanovg and stb #9559

Closed

Conversation

JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Jan 6, 2020

port stb and nanovg have file conflicts:

2020-01-04T12:18:04.9047756Z The following files are already installed in C:/vsts/_work/3/s/installed/x86-windows and are in conflict with stb:x86-windows
2020-01-04T12:18:04.9049652Z 
2020-01-04T12:18:04.9051732Z Installed by nanovg:x86-windows
2020-01-04T12:18:04.9053626Z     include/stb_image.h

So far the pipeline has only reported x86-windows conflicts and less than 10 ports depend on stb, so only stb:x86-windows=ignore is added.

Related: #9552 #9550.

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Jan 6, 2020
@cenit
Copy link
Contributor

cenit commented Jan 6, 2020

isn't it better to remove stb header from nanovg and add a dependency on it?

@dan-shaw dan-shaw removed the info:reviewed Pull Request changes follow basic guidelines label Jan 6, 2020
@cenit
Copy link
Contributor

cenit commented Jan 6, 2020

it has been fixed in master thanks to #8813 merge, I think this PR is no longer necessary

@JackBoosY JackBoosY closed this Jan 7, 2020
@JackBoosY JackBoosY deleted the dev/jack/update_baseline_stb branch January 7, 2020 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants