From 36e3205c67da85eadd30398b272f5dcd473d4fbf Mon Sep 17 00:00:00 2001
From: Clayton Wheeler <cswheeler@gmail.com>
Date: Fri, 17 Dec 2021 00:56:56 -0600
Subject: [PATCH] [elfutils] provide static or shared libraries correctly
 (#22055)

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.
---
 ports/elfutils/portfile.cmake | 6 +++---
 ports/elfutils/vcpkg.json     | 2 +-
 versions/baseline.json        | 2 +-
 versions/e-/elfutils.json     | 5 +++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake
index 7b7aae50e1..4dfa7c997c 100644
--- a/ports/elfutils/portfile.cmake
+++ b/ports/elfutils/portfile.cmake
@@ -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
diff --git a/ports/elfutils/vcpkg.json b/ports/elfutils/vcpkg.json
index ba686648fb..1f918e73c2 100644
--- a/ports/elfutils/vcpkg.json
+++ b/ports/elfutils/vcpkg.json
@@ -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",
diff --git a/versions/baseline.json b/versions/baseline.json
index 28daecf64f..38c1758147 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2006,7 +2006,7 @@
     },
     "elfutils": {
       "baseline": "0.182",
-      "port-version": 1
+      "port-version": 2
     },
     "embree2": {
       "baseline": "2.17.7",
diff --git a/versions/e-/elfutils.json b/versions/e-/elfutils.json
index 6c9d614b27..bc61bd61de 100644
--- a/versions/e-/elfutils.json
+++ b/versions/e-/elfutils.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9aa4fefa61893cd4b37c0f1a2f16ab255ab0c4bf",
+      "version-string": "0.182",
+      "port-version": 2
+    },
     {
       "git-tree": "aa738c679581e92da4ec8a1662171ac5608e3744",
       "version-string": "0.182",