From 8b3e2cefb43becb05e3bb92f7f65e2cf92fb29ec Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Mon, 25 Jan 2021 20:20:36 +0530 Subject: [PATCH] vulkan-loader: Disable suffix in static library. --- .../004-disable-suffix-in-static-lib.patch | 11 +++++++++++ mingw-w64-vulkan-loader/PKGBUILD | 7 +++++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 mingw-w64-vulkan-loader/004-disable-suffix-in-static-lib.patch diff --git a/mingw-w64-vulkan-loader/004-disable-suffix-in-static-lib.patch b/mingw-w64-vulkan-loader/004-disable-suffix-in-static-lib.patch new file mode 100644 index 0000000000..3cfef11303 --- /dev/null +++ b/mingw-w64-vulkan-loader/004-disable-suffix-in-static-lib.patch @@ -0,0 +1,11 @@ +--- a/loader/CMakeLists.txt ++++ b/loader/CMakeLists.txt +@@ -326,7 +326,7 @@ + foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS}) + set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}") + endforeach() +- if(WIN32) ++ if(MSVC) + set(VULKAN_LIB_SUFFIX "-1") + endif () + configure_file("vulkan.pc.in" "vulkan.pc" @ONLY) diff --git a/mingw-w64-vulkan-loader/PKGBUILD b/mingw-w64-vulkan-loader/PKGBUILD index 35aeb45334..28b81da9dd 100644 --- a/mingw-w64-vulkan-loader/PKGBUILD +++ b/mingw-w64-vulkan-loader/PKGBUILD @@ -20,16 +20,19 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-python") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz" 002-proper-def-files-for-32bit.patch - 003-generate-pkgconfig-files.patch) + 003-generate-pkgconfig-files.patch + 004-disable-suffix-in-static-lib.patch) sha256sums=('1094b303ead1843fd31a5c11b0f5c2f91949b0608f36619bf92c738f6d561b35' 'e6712796c69d88172b38ae467ff27e9d40101b8934d52f944a49898493378039' - 'd97fbcc042eb303812df7bc5f714ffacaf36381a77ced0991004df5dac9e975b') + 'd97fbcc042eb303812df7bc5f714ffacaf36381a77ced0991004df5dac9e975b' + '4924977e780c45e970e2a7311ea67ab2b208ca487c584be8702721ce060d5d71') prepare() { cd ${srcdir}/${_realname}-${pkgver} #patch -p1 -i ${srcdir}/001-build-fix.patch patch -p1 -i ${srcdir}/002-proper-def-files-for-32bit.patch patch -p1 -i ${srcdir}/003-generate-pkgconfig-files.patch + patch -p1 -i ${srcdir}/004-disable-suffix-in-static-lib.patch } build() {