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

[cairo] fix accidental dependency on system libbfd #23022

Merged
merged 2 commits into from
Feb 18, 2022

Conversation

DarthGandalf
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

The build was broken if the system has bfd installed, it tried to use /usr/include/x86_64-pc-linux-gnu/bfd.h which in turn complained that "config.h" was not included.

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    tested on x64-linux, and yes

  • Does your PR follow the maintainer guide?

yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    yes

If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/

@ghost
Copy link

ghost commented Feb 9, 2022

CLA assistant check
All CLA requirements met.

@JonLiu1993 JonLiu1993 self-assigned this Feb 10, 2022
@JonLiu1993 JonLiu1993 added the category:port-bug The issue is with a library, which is something the port should already support label Feb 10, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/cairo/vcpkg.json

Valid values for the license field are listed at https://spdx.org/licenses/

@JonLiu1993
Copy link
Member

@DarthGandalf ,Thanks for your pr, could you please sign CLA first?

@DarthGandalf
Copy link
Contributor Author

Done

@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Feb 11, 2022
@JonLiu1993 JonLiu1993 added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Feb 11, 2022
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

You have modified or added at least one vcpkg.json where a "license" field is missing.

If you feel able to do so, please consider adding a "license" field to the following files:

  • ports/cairo/vcpkg.json

Valid values for the license field can be found in the documentation

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Feb 17, 2022
@vicroms vicroms merged commit 590beeb into microsoft:master Feb 18, 2022
SchaichAlonso pushed a commit to PurpleFlowerGarden/vcpkg that referenced this pull request Mar 30, 2022
Upstream has introduced an option to disable bfd. Use the option
to disable it (See microsoft#23022)
dan-shaw pushed a commit that referenced this pull request Apr 1, 2022
* [cairo] upgrade cairo to 1.7.6 (#23848)

* [cairo] remove patch (#23848)

0001-meson-fix-macOS-build-and-add-macOS-ci.patch has been merged
into the upstream repository and is part of the 1.7.6 release.

* [cairo] use meson option to disable bfd (#23848)

Upstream has introduced an option to disable bfd. Use the option
to disable it (See #23022)

* [cairo] chase upstream cflags handling (#23848)

Upstream has put all cflags handling into the top-level meson.

Move our static compilation indicator definition to the top level,
too.

* [cairo] force-disable xcb (#23848)

This is the next update

* [cairo] format vcpkg.json (#23848)

* [cairo] update version registries (#23848)

* [cairo] add license (#23848)

* [cairo] regenerate versions registry (#23848)

Co-authored-by: Schaich <alonso.schaich@sodgeit.de>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants