Skip to content

[vcpkg baseline][libao] Disable dlfcn check under windows #23235

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.

Sign up for GitHub

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

Merged
BillyONeal merged 3 commits into from
Feb 23, 2022
Merged

[vcpkg baseline][libao] Disable dlfcn check under windows #23235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5a86d1
[libao] Add parameter to control whether to detect dlfcn
Feb 23, 2022
f3cbd44
Use Cache variables instead of patch file
Feb 23, 2022
f9999f8
Avoid using undefined variable
Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ports/libao/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
set(NO_DLFCN )
Copy link
Contributor

@dg0yt dg0yt Feb 24, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

This is bad CMake style. It unsets the variable in the current scope, unhiding a possible value from a parent scope. For a clean variable, always use:

set(VAR "")

Copy link
Contributor

@dg0yt dg0yt Feb 24, 2022

Choose a reason for hiding this comment

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

https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/cmake-guidelines.md

if(VCPKG_TARGET_IS_WINDOWS)
list(APPEND PATCHES "0001-windows-build-patch.patch")
set(NO_DLFCN "ac_cv_header_dlfcn_h=no")
endif()

vcpkg_from_github(
Expand All @@ -18,7 +20,8 @@ endif()
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}
AUTOCONFIG
OPTIONS --disable-binaries
OPTIONS --disable-binaries
${NO_DLFCN}
)
vcpkg_install_make()

Expand Down
2 changes: 1 addition & 1 deletion ports/libao/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libao",
"version": "1.2.2",
"port-version": 3,
"port-version": 4,
"description": "libao - A Cross-platform Audio Library",
"homepage": "https://github.com/xiph/libao",
"license": "GPL-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3334,7 +3334,7 @@
},
"libao": {
"baseline": "1.2.2",
"port-version": 3
"port-version": 4
},
"libarchive": {
"baseline": "3.5.2",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "11240d91b73e6a968da37b8053a8a64a6d9ea55f",
"version": "1.2.2",
"port-version": 4
},
{
"git-tree": "931d3ed363323bdc4de00c91165f3a09e23fb6b1",
"version": "1.2.2",
Expand Down