[treehopper] Fix dependence libusb #35480

FrankXie05 · 2023-12-04T08:16:38Z

Fix #35435 (comment)
Note: Fix correct libusb usage.
Error:

/treehopper/src/1.11.3-f321b6be5f.clean/C++/API/inc/LibUsbConnection.h:9:10: fatal error: 'libusb-1.0/libusb.h' file not found
#include <libusb-1.0/libusb.h>
         ^~~~~~~~~~~~~~~~~~~~~
1 warning and 1 error generated.

Changes comply with the maintainer guide
~~SHA512s are updated for each updated download~~
The "supports" clause reflects platforms that may be fixed by this new version
Any fixed CI baseline entries are removed from that file.
Any patches that are no longer applied are deleted from the port's directory.
The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
Only one version is added to each modified port's versions file.

dg0yt · 2023-12-04T08:41:42Z

ports/treehopper/fix-dependences-libusb.patch

+     target_link_libraries(treehopper pthread ${CORE_FOUNDATION} ${IOKIT})
+ elseif(UNIX)
+-    target_link_libraries(treehopper usb-1.0 pthread)
+    find_package(libusb CONFIG REQUIRED)


Suggested change

+ find_package(libusb CONFIG REQUIRED)

+ find_package(libusb REQUIRED)

There is no config, so don't hard-code it. (There is not even a find module. Just a vcpkg wrapper.)

dg0yt · 2023-12-04T08:43:42Z

ports/treehopper/fix-dependences-libusb.patch

+++ b/C++/API/CMakeLists.txt
+@@ -37,7 +37,9 @@ if(APPLE)
+     find_library(IOKIT IOKit)
+     target_link_libraries(treehopper pthread ${CORE_FOUNDATION} ${IOKIT})


FTR IMO this should also be patched, to decouple cached artifacts from local SDK paths. Untested:

Suggested change

target_link_libraries(treehopper pthread ${CORE_FOUNDATION} ${IOKIT})

target_link_libraries(treehopper pthread "-framework CoreFoundation" "-framework IOKit")

I don't think we need to change the behavior of upstream:

find_library(IOKIT IOKit)

…kXie05/vcpkg into dev/Frank/treehopper_libusb

dg0yt · 2023-12-05T04:38:28Z

Use libusb pkgconfig, not vcpkg's cmake package hack.

BillyONeal · 2023-12-20T21:41:43Z

Use libusb pkgconfig, not vcpkg's cmake package hack.

I'm pretty sure in general that we currently prefer the unofficial cmake package because we don't have a great answer for what happens for pkgconfig on Windows, as downstream consumers of us don't usually have a copy of pkgconfig that their CMake is going to find.

That also said, that doesn't apply in this case because the libusb backend is never selected on Windows.

Neumann-A · 2023-12-20T21:47:33Z

because we don't have a great answer for what happens for pkgconfig on Windows, as downstream consumers of us don't usually have a copy of pkgconfig that their CMake is going to find.

Just depend on port pkgconf on windows and cmake will find that without problems.

BillyONeal · 2023-12-20T21:49:57Z

Just depend on port pkgconf on windows and cmake will find that without problems.

Not in downstream's CMake

ports/treehopper/fix-dependences.patch

Neumann-A · 2023-12-20T21:59:49Z

Not in downstream's CMake

It does. Did you forgot about:

vcpkg/scripts/buildsystems/vcpkg.cmake

Lines 557 to 590 in c6f9a7b

    
           option(VCPKG_SETUP_CMAKE_PROGRAM_PATH  "Enable the setup of CMAKE_PROGRAM_PATH to vcpkg paths" ON) 
        
           set(VCPKG_CAN_USE_HOST_TOOLS OFF) 
        
           if(DEFINED VCPKG_HOST_TRIPLET AND NOT VCPKG_HOST_TRIPLET STREQUAL "") 
        
               set(VCPKG_CAN_USE_HOST_TOOLS ON) 
        
           endif() 
        
           cmake_dependent_option(VCPKG_USE_HOST_TOOLS "Setup CMAKE_PROGRAM_PATH to use host tools" ON "VCPKG_CAN_USE_HOST_TOOLS" OFF) 
        
           unset(VCPKG_CAN_USE_HOST_TOOLS) 
        
           if(VCPKG_SETUP_CMAKE_PROGRAM_PATH) 
        
               set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools") 
        
               if(VCPKG_USE_HOST_TOOLS) 
        
                   set(tools_base_path "${VCPKG_INSTALLED_DIR}/${VCPKG_HOST_TRIPLET}/tools") 
        
               endif() 
        
               list(APPEND CMAKE_PROGRAM_PATH "${tools_base_path}") 
        
               file(GLOB Z_VCPKG_TOOLS_DIRS LIST_DIRECTORIES true "${tools_base_path}/*") 
        
               file(GLOB Z_VCPKG_TOOLS_FILES LIST_DIRECTORIES false "${tools_base_path}/*") 
        
               file(GLOB Z_VCPKG_TOOLS_DIRS_BIN LIST_DIRECTORIES true "${tools_base_path}/*/bin") 
        
               file(GLOB Z_VCPKG_TOOLS_FILES_BIN LIST_DIRECTORIES false "${tools_base_path}/*/bin") 
        
               list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_FILES} "") # need at least one item for REMOVE_ITEM if CMake <= 3.19 
        
               list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS_BIN ${Z_VCPKG_TOOLS_FILES_BIN} "") 
        
               string(REPLACE "/bin" "" Z_VCPKG_TOOLS_DIRS_TO_REMOVE "${Z_VCPKG_TOOLS_DIRS_BIN}") 
        
               list(REMOVE_ITEM Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_DIRS_TO_REMOVE} "") 
        
               list(APPEND Z_VCPKG_TOOLS_DIRS ${Z_VCPKG_TOOLS_DIRS_BIN}) 
        
               foreach(Z_VCPKG_TOOLS_DIR IN LISTS Z_VCPKG_TOOLS_DIRS) 
        
                   list(APPEND CMAKE_PROGRAM_PATH "${Z_VCPKG_TOOLS_DIR}") 
        
               endforeach() 
        
               unset(Z_VCPKG_TOOLS_DIR) 
        
               unset(Z_VCPKG_TOOLS_DIRS) 
        
               unset(Z_VCPKG_TOOLS_FILES) 
        
               unset(Z_VCPKG_TOOLS_DIRS_BIN) 
        
               unset(Z_VCPKG_TOOLS_FILES_BIN) 
        
               unset(Z_VCPKG_TOOLS_DIRS_TO_REMOVE) 
        
               unset(tools_base_path) 
        
           endif()

Since CMAKE_PROGRAM_PATH is modified find_program will actually find pkgconf if it is installed by vcpkg

BillyONeal · 2023-12-21T19:30:57Z

/azp run

azure-pipelines · 2023-12-21T19:31:06Z

Azure Pipelines successfully started running 1 pipeline(s).

BillyONeal · 2023-12-21T19:31:19Z

LLVM failure was a random ICE we aren't normally seeing in CI, so let's hope simply rerunning fixes it

dg0yt · 2023-12-21T19:41:48Z

Just depend on port pkgconf on windows and cmake will find that without problems.

"Without problems" is not true.
Our cmake maintainer functions do not set VCPKG_HOST_TRIPLET. So the host pkgconf is not found without extra options.
Related discussion is (at least) in #25529.

FrankXie05 added 2 commits December 4, 2023 08:12

[treehopper] Fix dependence libusb

567f852

version

8aceb09

FrankXie05 added category:port-bug The issue is with a library, which is something the port should already support info:internal This PR or Issue was filed by the vcpkg team. labels Dec 4, 2023

FrankXie05 assigned Cheney-W Dec 4, 2023

remove ci.baseline.txt

42402a4

dg0yt reviewed Dec 4, 2023

View reviewed changes

FrankXie05 and others added 11 commits December 4, 2023 09:00

update patch

c519f22

use new function

68a5bbb

version

8aaf5a7

version

d51178b

update

a7c2aa5

Merge branch 'master' into dev/Frank/treehopper_libusb

cf7ece0

update patch

29cf9d6

version

0d657fe

Merge branch 'dev/Frank/treehopper_libusb' of https://github.com/Fran…

5134e88

…kXie05/vcpkg into dev/Frank/treehopper_libusb

merge master

a769c73

version

0912edb

MonicaLiu0311 mentioned this pull request Dec 5, 2023

[libusb] Fix usage #35498

Merged

7 tasks

vicroms closed this in #35498 Dec 14, 2023

FrankXie05 reopened this Dec 15, 2023

FrankXie05 added 2 commits December 15, 2023 07:25

update patch

31f91c4

version

43e6982

FrankXie05 marked this pull request as ready for review December 18, 2023 02:46

Cheney-W previously approved these changes Dec 20, 2023

View reviewed changes

Cheney-W added the info:reviewed Pull Request changes follow basic guidelines label Dec 20, 2023

Merge remote-tracking branch 'origin/master' into HEAD

d95856c

BillyONeal reviewed Dec 20, 2023

View reviewed changes

ports/treehopper/fix-dependences.patch Show resolved Hide resolved

Guard the libusb dependency for Linux.

94f03d0

BillyONeal dismissed Cheney-W’s stale review via 94f03d0 December 20, 2023 21:51

BillyONeal previously approved these changes Dec 20, 2023

View reviewed changes

Block UWP formerly blocked by the dependency on libusb..

8a817d2

BillyONeal dismissed their stale review via 8a817d2 December 21, 2023 04:22

BillyONeal merged commit f304349 into microsoft:master Dec 22, 2023
15 checks passed

FrankXie05 deleted the dev/Frank/treehopper_libusb branch December 22, 2023 01:59

Osyotr pushed a commit to Osyotr/vcpkg that referenced this pull request Jan 23, 2024

[treehopper] Fix dependency handling of libusb (microsoft#35480)

de21adf

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[treehopper] Fix dependence libusb #35480

[treehopper] Fix dependence libusb #35480

FrankXie05 commented Dec 4, 2023

dg0yt Dec 4, 2023

dg0yt Dec 4, 2023

FrankXie05 Dec 4, 2023

dg0yt commented Dec 5, 2023

BillyONeal commented Dec 20, 2023

Neumann-A commented Dec 20, 2023

BillyONeal commented Dec 20, 2023

Neumann-A commented Dec 20, 2023

BillyONeal commented Dec 21, 2023

azure-pipelines bot commented Dec 21, 2023

BillyONeal commented Dec 21, 2023

dg0yt commented Dec 21, 2023

	+ find_package(libusb CONFIG REQUIRED)
	+ find_package(libusb REQUIRED)

	target_link_libraries(treehopper pthread ${CORE_FOUNDATION} ${IOKIT})
	target_link_libraries(treehopper pthread "-framework CoreFoundation" "-framework IOKit")

[treehopper] Fix dependence libusb #35480

[treehopper] Fix dependence libusb #35480

Conversation

FrankXie05 commented Dec 4, 2023

dg0yt Dec 4, 2023

Choose a reason for hiding this comment

dg0yt Dec 4, 2023

Choose a reason for hiding this comment

FrankXie05 Dec 4, 2023

Choose a reason for hiding this comment

dg0yt commented Dec 5, 2023

BillyONeal commented Dec 20, 2023

Neumann-A commented Dec 20, 2023

BillyONeal commented Dec 20, 2023

Neumann-A commented Dec 20, 2023

BillyONeal commented Dec 21, 2023

azure-pipelines bot commented Dec 21, 2023

BillyONeal commented Dec 21, 2023

dg0yt commented Dec 21, 2023