From 863d3ccaafc00ea6f5bb4a9572d2ba95d7286a30 Mon Sep 17 00:00:00 2001 From: "xiaozhuai, Weihang Ding" <798047000@qq.com> Date: Tue, 20 Dec 2022 06:33:06 +0800 Subject: [PATCH] [pcapplusplus] Fix unresolved symbols (#28442) * [pcapplusplus] Fix unresolved symbols #28437 * update version database --- ports/pcapplusplus/CMakeLists.txt | 6 +++--- ports/pcapplusplus/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/p-/pcapplusplus.json | 5 +++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ports/pcapplusplus/CMakeLists.txt b/ports/pcapplusplus/CMakeLists.txt index 4bcc348f36..64922b804f 100644 --- a/ports/pcapplusplus/CMakeLists.txt +++ b/ports/pcapplusplus/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.12) -project(pcapplusplus CXX) +project(pcapplusplus C CXX) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") @@ -67,9 +67,9 @@ endif() # pcap++ file(GLOB PCAPPP_HEADERS "${CMAKE_CURRENT_LIST_DIR}/Pcap++/header/*.h") file(GLOB PCAPPP_SOURCES "${CMAKE_CURRENT_LIST_DIR}/Pcap++/src/*.cpp") -file(GLOB LIGHTPCAPNG_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/src/*.cpp") +file(GLOB LIGHTPCAPNG_SOURCES "${CMAKE_CURRENT_LIST_DIR}/3rdParty/LightPcapNg/LightPcapNg/src/*.c") -add_library(pcappp ${PCAPPP_SOURCES}) +add_library(pcappp ${PCAPPP_SOURCES} ${LIGHTPCAPNG_SOURCES}) target_include_directories(pcappp PUBLIC $ $ "${PCAP_INCLUDES}" $) diff --git a/ports/pcapplusplus/vcpkg.json b/ports/pcapplusplus/vcpkg.json index 450be307f9..dd11894a57 100644 --- a/ports/pcapplusplus/vcpkg.json +++ b/ports/pcapplusplus/vcpkg.json @@ -1,7 +1,7 @@ { "name": "pcapplusplus", "version-string": "22.05", - "port-version": 1, + "port-version": 2, "description": "PcapPlusPlus is a multi-platform C++ library for capturing, parsing and crafting of network packets", "homepage": "https://github.com/seladb/PcapPlusPlus", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 6a88d45fa9..10ccc3bb74 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5730,7 +5730,7 @@ }, "pcapplusplus": { "baseline": "22.05", - "port-version": 1 + "port-version": 2 }, "pcg": { "baseline": "2021-04-06", diff --git a/versions/p-/pcapplusplus.json b/versions/p-/pcapplusplus.json index d399560605..919d09b083 100644 --- a/versions/p-/pcapplusplus.json +++ b/versions/p-/pcapplusplus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8e13cef16f2b535aabf5672b3617ff0559772f61", + "version-string": "22.05", + "port-version": 2 + }, { "git-tree": "fc809c85d5fb8f4c3132cac73cd48df0704dd170", "version-string": "22.05",