From 72010900b7cee36cea77aebb97695095c9358eaf Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 5 Dec 2023 04:47:16 +0100 Subject: [PATCH] [libusb] Set host triplet for wasm32 (#35292) --- ports/libusb/portfile.cmake | 3 +++ ports/libusb/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libusb.json | 5 +++++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/libusb/portfile.cmake b/ports/libusb/portfile.cmake index 0438794ed2643d..4c69b06c6dead8 100644 --- a/ports/libusb/portfile.cmake +++ b/ports/libusb/portfile.cmake @@ -43,6 +43,9 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) else() vcpkg_list(SET MAKE_OPTIONS) vcpkg_list(SET LIBUSB_LINK_LIBRARIES) + if(VCPKG_TARGET_IS_EMSCRIPTEN) + vcpkg_list(APPEND MAKE_OPTIONS BUILD_TRIPLET --host=wasm32) + endif() if("udev" IN_LIST FEATURES) vcpkg_list(APPEND MAKE_OPTIONS "--enable-udev") vcpkg_list(APPEND LIBUSB_LINK_LIBRARIES udev) diff --git a/ports/libusb/vcpkg.json b/ports/libusb/vcpkg.json index 810f16e4dc34bf..0dd6263bb26fea 100644 --- a/ports/libusb/vcpkg.json +++ b/ports/libusb/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libusb", "version": "1.0.26.11791", - "port-version": 4, + "port-version": 5, "description": "a cross-platform library to access USB devices", "homepage": "https://github.com/libusb/libusb", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index f50f7593beb0c5..1566449e30c375 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4970,7 +4970,7 @@ }, "libusb": { "baseline": "1.0.26.11791", - "port-version": 4 + "port-version": 5 }, "libusb-win32": { "baseline": "1.2.6.0", diff --git a/versions/l-/libusb.json b/versions/l-/libusb.json index f1dd0c3ab566b1..15dcbcc464ecd0 100644 --- a/versions/l-/libusb.json +++ b/versions/l-/libusb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f4d325ede3cd1de2acd9a2d8f2708ec1e758cf0a", + "version": "1.0.26.11791", + "port-version": 5 + }, { "git-tree": "1e6400f24988b86ad461447df4eef8efc56a919f", "version": "1.0.26.11791",