forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-libs/vulkan-loader: Fix pkgconfig
Fixes: https://bugs.gentoo.org/760420 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Nick Sarnie <[email protected]>
- Loading branch information
Showing
2 changed files
with
45 additions
and
0 deletions.
There are no files selected for viewing
43 changes: 43 additions & 0 deletions
43
media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
From d0cfd15c09f1581278317a5c0ece8f213ba5578f Mon Sep 17 00:00:00 2001 | ||
From: Nick Sarnie <[email protected]> | ||
Date: Wed, 16 Dec 2020 23:38:00 -0500 | ||
Subject: [PATCH] Revert "pkgconfig: Missing lib suffx on win32" | ||
|
||
This reverts commit 10c4ebadb9fc41e0abf5a32daa7263c6d1aff575. | ||
|
||
Signed-off-by: Nick Sarnie <[email protected]> | ||
--- | ||
loader/CMakeLists.txt | 3 --- | ||
loader/vulkan.pc.in | 2 +- | ||
2 files changed, 1 insertion(+), 4 deletions(-) | ||
|
||
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt | ||
index 659511855..f7b9916b2 100644 | ||
--- a/loader/CMakeLists.txt | ||
+++ b/loader/CMakeLists.txt | ||
@@ -326,9 +326,6 @@ if(PKG_CONFIG_FOUND) | ||
foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) | ||
set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") | ||
endforeach() | ||
- if(WIN32) | ||
- set(LIB_SUFFIX "-1") | ||
- endif () | ||
configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) | ||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") | ||
endif() | ||
diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in | ||
index fc17cb1f3..f1588c412 100644 | ||
--- a/loader/vulkan.pc.in | ||
+++ b/loader/vulkan.pc.in | ||
@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ | ||
Name: @CMAKE_PROJECT_NAME@ | ||
Description: Vulkan Loader | ||
Version: @VK_API_VERSION@ | ||
-Libs: -L${libdir} -lvulkan@LIB_SUFFIX@ | ||
+Libs: -L${libdir} -lvulkan | ||
Libs.private: @PRIVATE_LIBS@ | ||
Cflags: -I${includedir} | ||
|
||
-- | ||
2.29.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters