Skip to content

[boost-modular-build-helper] Fixup mingw lib names#20576

Merged
BillyONeal merged 4 commits intomicrosoft:masterfrom
dg0yt:boost-mingw
Oct 12, 2021
Merged

[boost-modular-build-helper] Fixup mingw lib names#20576
BillyONeal merged 4 commits intomicrosoft:masterfrom
dg0yt:boost-mingw

Conversation

@dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Oct 7, 2021

Describe the pull request

  • What does your PR fix?

    Fixes building boost on mingw on windows, removing all tags from the static and import lib names (.a and .dll.a).
    Almost the same is already implemented for .lib names.

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

    all+mingw, no

  • 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

Tested with x64-mingw-static and -dynamic on windows.

@PhoebeHui PhoebeHui self-assigned this Oct 8, 2021
@PhoebeHui PhoebeHui added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Oct 8, 2021
Copy link
Contributor

@PhoebeHui PhoebeHui left a comment

Choose a reason for hiding this comment

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

LGTM

@PhoebeHui PhoebeHui added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Oct 8, 2021
endif()
endforeach()
# Similar for mingw
file(GLOB INSTALLED_LIBS "${CURRENT_PACKAGES_DIR}/debug/lib/*-mgw10-*.a" "${CURRENT_PACKAGES_DIR}/lib/*-mgw10-*.a")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Other than in the regex below, the glob uses literal -mgw10-. I'm not sure what the 10 stands for. Maybe gcc version? It might be more robust to use -mgw*- instead. The regex will still limit the cases of renaming.

@BillyONeal BillyONeal added the depends:different-pr This PR or Issue depends on a PR which has been filed label Oct 12, 2021
@BillyONeal
Copy link
Member

This change looks good but I want to make sure it builds cleanly with #20432

@BillyONeal
Copy link
Member

I pushed a merge with master to ensure #20432 was applied and that rerunning generate-ports resulted in no additional changes.

@BillyONeal BillyONeal removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Oct 12, 2021
@BillyONeal BillyONeal merged commit 5fb4257 into microsoft:master Oct 12, 2021
@BillyONeal
Copy link
Member

Thanks for fixing MinGW!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants