Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ports/apsi/fix-jsoncpp-target.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81bf76f..13a8d09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,7 +265,7 @@ target_link_libraries(apsi
PUBLIC SEAL::seal
PUBLIC Kuku::kuku
PUBLIC flatbuffers::flatbuffers
- PUBLIC jsoncpp_static)
+ PUBLIC JsonCpp::JsonCpp)
if(APSI_USE_LOG4CPLUS)
target_link_libraries(apsi PUBLIC log4cplus::log4cplus)
endif()
28 changes: 28 additions & 0 deletions ports/apsi/fix-log4cplus-byte-ambiguity.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
--- a/common/apsi/log.cpp 2026-08-08 03:05:11.906696658 +0900
+++ b/common/apsi/log.cpp 2026-08-08 03:05:26.372972353 +0900
@@ -13,6 +13,13 @@
#include "apsi/config.h"
#include "apsi/log.h"

+#ifdef APSI_USE_LOG4CPLUS
+#include "log4cplus/consoleappender.h"
+#include "log4cplus/fileappender.h"
+#include "log4cplus/logger.h"
+#include "log4cplus/nullappender.h"
+#endif
+
using namespace std;

namespace apsi {
@@ -86,11 +93,6 @@

#ifdef APSI_USE_LOG4CPLUS

-#include "log4cplus/consoleappender.h"
-#include "log4cplus/fileappender.h"
-#include "log4cplus/logger.h"
-#include "log4cplus/nullappender.h"
-
using namespace log4cplus;

namespace apsi {
5 changes: 4 additions & 1 deletion ports/apsi/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ vcpkg_from_github(
fix-find-seal.patch
fix-c2398.patch
fix-find-kuku.patch
fix-log4cplus-byte-ambiguity.patch
# https://github.com/microsoft/APSI/issues/84
fix-jsoncpp-target.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand All @@ -25,7 +28,7 @@ if (VCPKG_CROSSCOMPILING)
endif()
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
set(CROSSCOMP_OPTIONS -DAPSI_FOURQ_AMD64_EXITCODE=0 -DHAVE_AVX_EXTENSIONS_EXITCODE=0 -DHAVE_AVX2_EXTENSIONS_EXITCODE=1)
endif()
endif()
endif()

vcpkg_cmake_configure(
Expand Down
2 changes: 1 addition & 1 deletion ports/apsi/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "apsi",
"version-semver": "0.11.0",
"port-version": 2,
"port-version": 3,
"description": "APSI is a research library for asymmetric private set intersection.",
"homepage": "https://github.com/microsoft/APSI",
"license": "MIT",
Expand Down
6 changes: 4 additions & 2 deletions ports/log4cplus/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
string(REPLACE "." "_" VERSION_UNDERSCORE "${VERSION}")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO log4cplus/log4cplus
REF REL_2_1_2
SHA512 37d37107f327cf343784d68ea4a18ee7eaa0a943e56075ebd14318b8905954649501f0228c6086058d89f97a332e73cabfc64ea7290ae79578fd583590661b94
REF REL_${VERSION_UNDERSCORE}
SHA512 85b3721e77c54036e7b33537dd80599cd1f1a0bb2669c31084e1732baa73010eb42e61cd553a839c0455f9a7859289d6585279213f243fadf184a33569d97283
HEAD_REF master
)

Expand Down
4 changes: 2 additions & 2 deletions ports/log4cplus/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "log4cplus",
"version": "2.1.2",
"version": "2.2.0.1",
"description": "A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration",
"homepage": "https://github.com/log4cplus/log4cplus",
"license": "Apache-2.0 AND BSD-2-Clause",
"license": "Apache-2.0 AND BSD-2-Clause AND Zlib",
"dependencies": [
{
"name": "vcpkg-cmake",
Expand Down
5 changes: 5 additions & 0 deletions versions/a-/apsi.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "575057c1d1eb4bf8ba68bdd8eb774a857eac66b8",
"version-semver": "0.11.0",
"port-version": 3
},
{
"git-tree": "2b55029ec6a1e04c5f69c534871c998f2c63d066",
"version-semver": "0.11.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
},
"apsi": {
"baseline": "0.11.0",
"port-version": 2
"port-version": 3
},
"aravis": {
"baseline": "0.8.36",
Expand Down Expand Up @@ -6233,7 +6233,7 @@
"port-version": 1
},
"log4cplus": {
"baseline": "2.1.2",
"baseline": "2.2.0.1",
"port-version": 0
},
"log4cpp-log4cpp": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/log4cplus.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e43000ec0e535d92ca1a7e9759a434bd47633844",
"version": "2.2.0.1",
"port-version": 0
},
{
"git-tree": "4a25677e8f558eefc3ec3c0e95fed4140b009326",
"version": "2.1.2",
Expand Down
Loading