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

[openal-soft] Remove removing macro in dynamic triplets #20310

Merged
merged 1 commit into from
Sep 27, 2021

Conversation

BillyONeal
Copy link
Member

Add workaround suggested by Robert in #18098

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 portfile where deprecated functions are used.

If you feel able to do so, please consider migrating them to the new functions:
vcpkg_install_cmake -> vcpkg_cmake_install (from port vcpkg-cmake)
vcpkg_build_cmake -> vcpkg_cmake_build (from port vcpkg-cmake)
vcpkg_configure_cmake -> vcpkg_cmake_configure (Please remove the option PREFER_NINJA) (from port vcpkg-cmake)
vcpkg_fixup_cmake_targets -> vcpkg_cmake_config_fixup (from port vcpkg-cmake-config)

In the ports that use the new function, you have to add the corresponding dependencies:

{
  "name": "vcpkg-cmake",
  "host": true
},
{
  "name": "vcpkg-cmake-config",
  "host": true
}

The following files are affected:

  • ports/openal-soft/portfile.cmake

@PhoebeHui PhoebeHui added info:internal This PR or Issue was filed by the vcpkg team. category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist labels Sep 24, 2021
@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Sep 24, 2021
@BillyONeal BillyONeal removed the info:reviewed Pull Request changes follow basic guidelines label Sep 24, 2021
@BillyONeal
Copy link
Member Author

Dropping reviewed: this is ready to land as far as I'm concerned but I would like @DanielGibson and/or @HarrievG to confirm that their bug is actually fixed before merging.

@HarrievG
Copy link

checking dhewm3's dedicated build with VCPKG/CMAKE right now.

@@ -80,7 +80,10 @@ foreach(HEADER al.h alc.h)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
string(REPLACE "defined(AL_LIBTYPE_STATIC)" "1" AL_H "${AL_H}")
else()

Choose a reason for hiding this comment

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

you want to keep the empty if case?

Choose a reason for hiding this comment

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

probably to put the comment in?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, the empty else() is to indicate that we didn't forget and it is intentional.

@HarrievG
Copy link

HarrievG commented Sep 24, 2021

Fix Confirmed (x64-windows)
install-x64-windows-dbg-out.log
install-x64-windows-rel-out.log

@BillyONeal BillyONeal merged commit 3768cef into microsoft:master Sep 27, 2021
@BillyONeal BillyONeal deleted the openal branch September 27, 2021 20:59
@BillyONeal
Copy link
Member Author

As the issue reporters reported that this fixes it, landed.

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:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants