From b23242b620a4e61858409c1ab8b8449f934fcff2 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 24 Feb 2022 03:58:56 +0800 Subject: [PATCH] [vcpkg baseline][libao] Disable dlfcn check under windows (#23235) * [libao] Add parameter to control whether to detect dlfcn * Use Cache variables instead of patch file * Avoid using undefined variable Co-authored-by: Cheney-Wang --- ports/libao/portfile.cmake | 5 ++++- ports/libao/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libao.json | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ports/libao/portfile.cmake b/ports/libao/portfile.cmake index ae01234926115c..274beec82ec25c 100644 --- a/ports/libao/portfile.cmake +++ b/ports/libao/portfile.cmake @@ -1,5 +1,7 @@ +set(NO_DLFCN ) 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( @@ -18,7 +20,8 @@ endif() vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG - OPTIONS --disable-binaries + OPTIONS --disable-binaries + ${NO_DLFCN} ) vcpkg_install_make() diff --git a/ports/libao/vcpkg.json b/ports/libao/vcpkg.json index e9e38670cf3d4a..18f7a2675107f4 100644 --- a/ports/libao/vcpkg.json +++ b/ports/libao/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 823d6889348c2f..7c1728bb6be5ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3334,7 +3334,7 @@ }, "libao": { "baseline": "1.2.2", - "port-version": 3 + "port-version": 4 }, "libarchive": { "baseline": "3.5.2", diff --git a/versions/l-/libao.json b/versions/l-/libao.json index dcd2a4f41a1014..e5186e1ae4eeb6 100644 --- a/versions/l-/libao.json +++ b/versions/l-/libao.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11240d91b73e6a968da37b8053a8a64a6d9ea55f", + "version": "1.2.2", + "port-version": 4 + }, { "git-tree": "931d3ed363323bdc4de00c91165f3a09e23fb6b1", "version": "1.2.2",