mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-06 09:07:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg_configure_make] Force libdir to lib (#19666)

Browse Source 
Some Linux distributions (e.g. the OpenSUSE family) defaults to lib64
instead of lib, which breaks vcpkg's assumtion that libraries are in
lib.

Use the --libdir option of autotools to force the directory to be lib
This commit is contained in:
Nicolas Fella 2021-09-24 21:41:20 +02:00 committed by GitHub
parent a4368eabea
commit 59a3f35e7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/cmake/vcpkg_configure_make.cmake
View File

@ -491,7 +491,7 @@ function(vcpkg_configure_make)
# Important: These should all be relative to prefix!
"--bindir=${prefix_var}/tools/${PORT}/bin"
"--sbindir=${prefix_var}/tools/${PORT}/sbin"
#"--libdir='\${prefix}'/lib" # already the default!
"--libdir=${prefix_var}/lib" # On some Linux distributions lib64 is the default
#"--includedir='\${prefix}'/include" # already the default!
"--mandir=${prefix_var}/share/${PORT}"
"--docdir=${prefix_var}/share/${PORT}"
@ -500,7 +500,7 @@ function(vcpkg_configure_make)
# Important: These should all be relative to prefix!
"--bindir=${prefix_var}/../tools/${PORT}/debug/bin"
"--sbindir=${prefix_var}/../tools/${PORT}/debug/sbin"
#"--libdir='\${prefix}'/lib" # already the default!
"--libdir=${prefix_var}/lib" # On some Linux distributions lib64 is the default
"--includedir=${prefix_var}/../include"
"--datarootdir=${prefix_var}/share/${PORT}")
endif()