Skip to content

Fix vulkan.pc Libs.private for static builds#1054

Merged
charles-lunarg merged 1 commit intoKhronosGroup:masterfrom
charles-lunarg:fix_pkg_config_libs_private
Nov 4, 2022
Merged

Fix vulkan.pc Libs.private for static builds#1054
charles-lunarg merged 1 commit intoKhronosGroup:masterfrom
charles-lunarg:fix_pkg_config_libs_private

Conversation

@charles-lunarg
Copy link
Copy Markdown
Collaborator

The Libs.private field shouldn't be present for shared library builds, so now the field wont be present in that case. For static library builds it should be present, but the fields should be deduplicated as well.

Additionally, this adds a github actions run for testing the static build of the loader on MacOS.

Fixes #490

@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build queued with queue ID 25782.

@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build # 1597 running.

@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build # 1597 passed.

@charles-lunarg charles-lunarg force-pushed the fix_pkg_config_libs_private branch from 0248fe9 to 1f86d2d Compare November 4, 2022 22:46
@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build queued with queue ID 27416.

@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build # 1608 running.

@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build # 1608 failed.

The Libs.private field shouldn't be present for shared library builds,
so now the field wont be present in that case. For static library builds
it should be present, but the fields should be deduplicated as well.

Additionally, this adds a github actions run for testing the static
build of the loader on MacOS. This requires making the test framework
capable of using a statically built loader, which mainly took making
VulkanFunctions capable of assigning the statically defined functions
instead of loading them with dlsym.

The static build option required changes to the unix_shim.cpp to not
cause infinite loops.
@charles-lunarg charles-lunarg force-pushed the fix_pkg_config_libs_private branch from 1f86d2d to bf9d6d8 Compare November 4, 2022 22:57
@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build queued with queue ID 27424.

@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build # 1609 running.

@ci-tester-lunarg
Copy link
Copy Markdown

CI Vulkan-Loader build # 1609 passed.

@charles-lunarg charles-lunarg merged commit 8ff839b into KhronosGroup:master Nov 4, 2022
@charles-lunarg charles-lunarg deleted the fix_pkg_config_libs_private branch November 4, 2022 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate libraries in pkg-config vulkan.pc's Libs.private

2 participants