[packages/Vulkan-Loader] use upstream fix for paths in pkgconfig file
atler
atler at pld-linux.org
Mon Nov 28 19:28:32 CET 2022
commit c41e5ef085804a9f318de5ef223e095005cacabe
Author: Jan Palus <atler at pld-linux.org>
Date: Mon Nov 28 19:27:26 2022 +0100
use upstream fix for paths in pkgconfig file
Vulkan-Loader.spec | 2 --
pc.patch | 39 +++++++++++++++++++++++++++++++++++----
2 files changed, 35 insertions(+), 6 deletions(-)
---
diff --git a/Vulkan-Loader.spec b/Vulkan-Loader.spec
index af5dc0c..08b949e 100644
--- a/Vulkan-Loader.spec
+++ b/Vulkan-Loader.spec
@@ -67,9 +67,7 @@ Pliki nagłówkowe loadera Vulkan.
install -d build
cd build
-# .pc file creation expect CMAKE_INSTALL_LIBDIR to be relative (to CMAKE_INSTALL_PREFIX)
%cmake .. \
- -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
-DBUILD_TESTS=%{?with_tests:ON}%{!?with_tests:OFF} \
-DBUILD_WSI_WAYLAND_SUPPORT=%{?with_wayland:ON}%{!?with_wayland:OFF} \
-DBUILD_WSI_XLIB_SUPPORT=%{?with_x11:ON}%{!?with_x11:OFF} \
diff --git a/pc.patch b/pc.patch
index 777fe4e..afe6eae 100644
--- a/pc.patch
+++ b/pc.patch
@@ -1,12 +1,43 @@
---- Vulkan-Loader-sdk-1.3.224.1/loader/vulkan.pc.in.orig 2022-08-15 17:32:06.000000000 +0200
-+++ Vulkan-Loader-sdk-1.3.224.1/loader/vulkan.pc.in 2022-11-27 01:05:11.149652405 +0100
+From 595993488ace91448d6ab809da0d1dc4a9f4128e Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus at fastmail.com>
+Date: Mon, 28 Nov 2022 13:29:21 +0100
+Subject: [PATCH] cmake: fix pkgconfig file for absolute install paths
+
+Fixes #1076
+---
+ loader/CMakeLists.txt | 7 +++++++
+ loader/vulkan.pc.in | 4 ++--
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
+index 2eb704fde..b24c037b4 100644
+--- a/loader/CMakeLists.txt
++++ b/loader/CMakeLists.txt
+@@ -409,6 +409,13 @@ if(PKG_CONFIG_FOUND)
+ else()
+ set(CMAKE_INSTALL_FULL_LIBDIR_PC ${CMAKE_INSTALL_FULL_LIBDIR})
+ endif ()
++ if ("${CMAKE_INSTALL_PREFIX}" STREQUAL "")
++ set(CMAKE_INSTALL_REL_LIBDIR_PC ${CMAKE_INSTALL_FULL_LIBDIR_PC})
++ set(CMAKE_INSTALL_REL_INCLUDEDIR_PC ${CMAKE_INSTALL_FULL_INCLUDEDIR})
++ else()
++ file(RELATIVE_PATH CMAKE_INSTALL_REL_LIBDIR_PC ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_LIBDIR_PC})
++ file(RELATIVE_PATH CMAKE_INSTALL_REL_INCLUDEDIR_PC ${CMAKE_INSTALL_PREFIX} ${CMAKE_INSTALL_FULL_INCLUDEDIR})
++ 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 82e9f5edc..1d38a22ef 100644
+--- a/loader/vulkan.pc.in
++++ b/loader/vulkan.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+libdir=@CMAKE_INSTALL_LIBDIR@
-+includedir=@CMAKE_INSTALL_INCLUDEDIR@
++libdir=${exec_prefix}/@CMAKE_INSTALL_REL_LIBDIR_PC@
++includedir=${prefix}/@CMAKE_INSTALL_REL_INCLUDEDIR_PC@
Name: @CMAKE_PROJECT_NAME@
Description: Vulkan Loader
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Vulkan-Loader.git/commitdiff/c41e5ef085804a9f318de5ef223e095005cacabe
More information about the pld-cvs-commit
mailing list