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

Switch to pkg-config-rs from GIT for working around MSVC linking issues #21293

Closed
wants to merge 1 commit into from

Conversation

@sdroege
Copy link

sdroege commented Jul 31, 2018

This PR removes a workaround from the appveyour setup which should be unneeded with latest pkg-config-rs. Previously for msvc builds the library paths were not taken into account properly.

Once this also works on the servo appveyour, a new pkg-config-rs release will be made and the patch section can be removed again from Cargo.toml. I'll update the PR then.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #21158 (comment)
  • There are tests for these changes OR
  • These changes do not require tests because they are changes to the CI setup

This change is Reviewable

cc @ferjm

@highfive
Copy link

highfive commented Jul 31, 2018

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @paulrouget (or someone else) soon.

@highfive
Copy link

highfive commented Jul 31, 2018

Heads up! This PR modifies the following files:

@sdroege
Copy link
Author

sdroege commented Jul 31, 2018

   = note: LINK : fatal error LNK1181: cannot open input file 'z.lib.lib'

First of all it seems like zlib was taken from the GStreamer binaries (instead of whatever was there before) since the webaudio PR. Second it looks like this still uses the old pkg-config for some reason.

I'll check this later.

@sdroege sdroege force-pushed the sdroege:webaudio-pkg-config-msvc branch from 722f951 to 7ee86de Aug 12, 2018
@sdroege sdroege force-pushed the sdroege:webaudio-pkg-config-msvc branch from 7ee86de to fb499cb Aug 12, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Aug 23, 2018

The latest upstream changes (presumably #21490) made this pull request unmergeable. Please resolve the merge conflicts.

@sdroege
Copy link
Author

sdroege commented Aug 28, 2018

Closing in favour of #21515, which is literally the same change :)

@sdroege sdroege closed this Aug 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.