mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 23:49:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[elfutils] provide static or shared libraries correctly (#22055)

Browse Source 
The logic for keeping the static or shared libraries according to
VCPKG_LIBRARY_LINKAGE was backwards, and it was providing shared
libraries when they should have been static, and vice versa.
This commit is contained in:
Clayton Wheeler 2021-12-17 00:56:56 -06:00 committed by GitHub
parent d31b8a6fe3
commit 36e3205c67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/elfutils/portfile.cmake
View File

@ -37,11 +37,11 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/locale)
# Remove files with wrong linkage
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(_lib_suffix "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
else()
set(_lib_suffix "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
else()
set(_lib_suffix "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
endif()
file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}")
file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}.*" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}.*")
file(REMOVE ${TO_REMOVE})
# # Handle copyright

2
ports/elfutils/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "elfutils",
"version-string": "0.182",
"port-version": 1,
"port-version": 2,
"description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.",
"homepage": "https://sourceware.org/elfutils/",
"supports": "!windows",

2
versions/baseline.json
View File

@ -2006,7 +2006,7 @@
},
"elfutils": {
"baseline": "0.182",
"port-version": 1
"port-version": 2
},
"embree2": {
"baseline": "2.17.7",

5
versions/e-/elfutils.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9aa4fefa61893cd4b37c0f1a2f16ab255ab0c4bf",
"version-string": "0.182",
"port-version": 2
},
{
"git-tree": "aa738c679581e92da4ec8a1662171ac5608e3744",
"version-string": "0.182",