[libpcap] Fix incorrect library name in libpcap.pc of non-windows bui…

…ld (#30398) * [libpcap] Fix incorrect library name in libpcap.pc of non-windows build * update version
microsoft · Mar 25, 2023 · 5dfb5ff · 5dfb5ff
1 parent 2e1322f
commit 5dfb5ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/ports/libpcap/install-pc-on-msvc.patch b/ports/libpcap/install-pc-on-msvc.patch
@@ -10,10 +10,10 @@ index b83fbbd..2f675d1 100644
 -# pcap-config and process man pages and arrange that they be installed.
 -if(NOT MSVC)
 +# Generate libpcap.pc
-+if(BUILD_SHARED_LIBS)
-+    set(PACKAGE_NAME ${LIBRARY_NAME})
-+else()
++if(MSVC AND NOT BUILD_SHARED_LIBS)
 +    set(PACKAGE_NAME ${LIBRARY_NAME}_static)
++else()
++    set(PACKAGE_NAME ${LIBRARY_NAME})
 +endif()
      set(prefix ${CMAKE_INSTALL_PREFIX})
      set(exec_prefix "\${prefix}")

diff --git a/ports/libpcap/vcpkg.json b/ports/libpcap/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libpcap",
   "version-semver": "1.10.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A portable C/C++ library for network traffic capture",
   "homepage": "https://www.tcpdump.org/",
+  "license": "BSD-3-Clause",
   "supports": "!uwp",
   "dependencies": [
     {

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4286,7 +4286,7 @@
     },
     "libpcap": {
       "baseline": "1.10.1",
-      "port-version": 2
+      "port-version": 3
     },
     "libpff": {
       "baseline": "2021-11-14",

diff --git a/versions/l-/libpcap.json b/versions/l-/libpcap.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6cf3667c0320e2ff5d92d45e91b07fb3bf2fe05e",
+      "version-semver": "1.10.1",
+      "port-version": 3
+    },
     {
       "git-tree": "b21dafcbcbd4a428b3800a6a686a473db8625ca6",
       "version-semver": "1.10.1",