Add files using upload-large-folder tool
Browse filesThis view is limited to 50 files because it contains too many changes.
See raw diff
- cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/fix-install-location.patch +40 -0
- cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch +14 -0
- cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch +63 -0
- cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/portfile.cmake +47 -0
- cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/vcpkg.json +24 -0
- cc-multilingual-main/cc_net/vcpkg/ports/bgfx/portfile.cmake +63 -0
- cc-multilingual-main/cc_net/vcpkg/ports/bgfx/vcpkg-inject-packages.cmake +8 -0
- cc-multilingual-main/cc_net/vcpkg/ports/bgfx/vcpkg.json +49 -0
- cc-multilingual-main/cc_net/vcpkg/ports/boost-process/portfile.cmake +12 -0
- cc-multilingual-main/cc_net/vcpkg/ports/configcat/portfile.cmake +31 -0
- cc-multilingual-main/cc_net/vcpkg/ports/configcat/vcpkg.json +41 -0
- cc-multilingual-main/cc_net/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch +26 -0
- cc-multilingual-main/cc_net/vcpkg/ports/eigen3/portfile.cmake +42 -0
- cc-multilingual-main/cc_net/vcpkg/ports/eigen3/remove_configure_checks.patch +48 -0
- cc-multilingual-main/cc_net/vcpkg/ports/eigen3/vcpkg.json +18 -0
- cc-multilingual-main/cc_net/vcpkg/ports/folly/disable-non-underscore-posix-names.patch +34 -0
- cc-multilingual-main/cc_net/vcpkg/ports/folly/fix-deps.patch +210 -0
- cc-multilingual-main/cc_net/vcpkg/ports/folly/portfile.cmake +96 -0
- cc-multilingual-main/cc_net/vcpkg/ports/folly/vcpkg.json +91 -0
- cc-multilingual-main/cc_net/vcpkg/ports/hnswlib/portfile.cmake +22 -0
- cc-multilingual-main/cc_net/vcpkg/ports/hnswlib/vcpkg.json +17 -0
- cc-multilingual-main/cc_net/vcpkg/ports/ijg-libjpeg/CMakeLists.txt +65 -0
- cc-multilingual-main/cc_net/vcpkg/ports/ijg-libjpeg/portfile.cmake +50 -0
- cc-multilingual-main/cc_net/vcpkg/ports/ijg-libjpeg/vcpkg.json +19 -0
- cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/always-generate-pdb.patch +80 -0
- cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in +5 -0
- cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in +4 -0
- cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in +16 -0
- cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/portfile.cmake +105 -0
- cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/usage +4 -0
- cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/vcpkg.json +6 -0
- cc-multilingual-main/cc_net/vcpkg/ports/lcm/disable-docs.patch +12 -0
- cc-multilingual-main/cc_net/vcpkg/ports/lcm/fix-build-error.patch +32 -0
- cc-multilingual-main/cc_net/vcpkg/ports/lcm/glib.link.patch +30 -0
- cc-multilingual-main/cc_net/vcpkg/ports/lcm/only-install-one-flavor.patch +19 -0
- cc-multilingual-main/cc_net/vcpkg/ports/lcm/portfile.cmake +47 -0
- cc-multilingual-main/cc_net/vcpkg/ports/lcm/vcpkg.json +23 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0001-Use-libtre.patch +53 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch +39 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch +43 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0004-Typedef-POSIX-types-on-Windows.patch +29 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch +25 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch +189 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0007-Substitute-unistd-macros-for-MSVC.patch +30 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0008-Add-FILENO-defines.patch +26 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch +118 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch +30 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch +24 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0013-Check-for-backslash-in-argv-0-on-Windows.patch +42 -0
- cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch +27 -0
cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/fix-install-location.patch
ADDED
@@ -0,0 +1,40 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/provisioning_client/CMakeLists.txt b/provisioning_client/CMakeLists.txt
|
2 |
+
index 39f269d51..ff53ca32d 100644
|
3 |
+
--- a/provisioning_client/CMakeLists.txt
|
4 |
+
+++ b/provisioning_client/CMakeLists.txt
|
5 |
+
@@ -357,7 +357,7 @@ if(${use_installed_dependencies})
|
6 |
+
set(CMAKE_INSTALL_LIBDIR "lib")
|
7 |
+
endif()
|
8 |
+
|
9 |
+
- install(TARGETS ${provisioning_libs} EXPORT azure_prov_sdksTargets
|
10 |
+
+ install(TARGETS ${provisioning_libs} EXPORT azure_iot_sdksTargets
|
11 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
12 |
+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
13 |
+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
14 |
+
@@ -372,26 +372,6 @@ if(${use_installed_dependencies})
|
15 |
+
VERSION ${PROV_SDK_VERSION}
|
16 |
+
COMPATIBILITY SameMajorVersion
|
17 |
+
)
|
18 |
+
-
|
19 |
+
- configure_file("../configs/${PROJECT_NAME}Config.cmake"
|
20 |
+
- "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake"
|
21 |
+
- COPYONLY
|
22 |
+
- )
|
23 |
+
-
|
24 |
+
- install(EXPORT azure_prov_sdksTargets
|
25 |
+
- FILE
|
26 |
+
- "${PROJECT_NAME}Targets.cmake"
|
27 |
+
- DESTINATION
|
28 |
+
- ${package_location}
|
29 |
+
- )
|
30 |
+
-
|
31 |
+
- install(
|
32 |
+
- FILES
|
33 |
+
- "../configs/${PROJECT_NAME}Config.cmake"
|
34 |
+
- "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
|
35 |
+
- DESTINATION
|
36 |
+
- ${package_location}
|
37 |
+
- )
|
38 |
+
else()
|
39 |
+
# Install Provisioning libs
|
40 |
+
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
|
cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/fix-iothubclient-includes.patch
ADDED
@@ -0,0 +1,14 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/iothub_client/CMakeLists.txt b/iothub_client/CMakeLists.txt
|
2 |
+
index 5a8f5573c..07ab3b7cb 100644
|
3 |
+
--- a/iothub_client/CMakeLists.txt
|
4 |
+
+++ b/iothub_client/CMakeLists.txt
|
5 |
+
@@ -442,8 +442,6 @@ target_include_directories(iothub_client
|
6 |
+
PUBLIC
|
7 |
+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/inc>
|
8 |
+
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot/include>
|
9 |
+
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/azureiot>
|
10 |
+
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/deps/umock-c/inc>
|
11 |
+
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/deps/azure-macro-utils-c/inc>
|
12 |
+
)
|
13 |
+
applyXcodeBuildFlagsIfNeeded(iothub_client)
|
14 |
+
target_link_libraries(iothub_client ${iothub_client_libs})
|
cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/improve-external-deps.patch
ADDED
@@ -0,0 +1,63 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 427e82e..5a58e47 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -257,6 +257,9 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/deps)
|
6 |
+
if(${use_installed_dependencies})
|
7 |
+
find_package(parson REQUIRED CONFIG)
|
8 |
+
endif()
|
9 |
+
+if(NOT TARGET parson)
|
10 |
+
+ add_library(parson ALIAS parson::parson)
|
11 |
+
+endif()
|
12 |
+
|
13 |
+
include_directories(${MACRO_UTILS_INC_FOLDER})
|
14 |
+
include_directories(${UMOCK_C_INC_FOLDER})
|
15 |
+
diff --git a/configs/azure_iot_sdksConfig.cmake b/configs/azure_iot_sdksConfig.cmake
|
16 |
+
index b9c62e8..edf5847 100644
|
17 |
+
--- a/configs/azure_iot_sdksConfig.cmake
|
18 |
+
+++ b/configs/azure_iot_sdksConfig.cmake
|
19 |
+
@@ -1,5 +1,11 @@
|
20 |
+
#Copyright (c) Microsoft. All rights reserved.
|
21 |
+
#Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
22 |
+
+include(CMakeFindDependencyMacro)
|
23 |
+
+find_dependency(parson)
|
24 |
+
+find_dependency(uamqp)
|
25 |
+
+find_dependency(uhttp)
|
26 |
+
+find_dependency(umqtt)
|
27 |
+
+find_dependency(azure_c_shared_utility)
|
28 |
+
|
29 |
+
include("${CMAKE_CURRENT_LIST_DIR}/azure_iot_sdksTargets.cmake")
|
30 |
+
|
31 |
+
diff --git a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
32 |
+
index 33b5b8709..45ef7b87a 100644
|
33 |
+
--- a/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
34 |
+
+++ b/iothub_client/tests/iothubclient_amqp_dt_e2e/CMakeLists.txt
|
35 |
+
@@ -22,11 +22,9 @@ set(${theseTestsName}_c_files
|
36 |
+
|
37 |
+
set(${theseTestsName}_c_files
|
38 |
+
../../../certs/certs.c
|
39 |
+
- ../../../deps/parson/parson.c
|
40 |
+
)
|
41 |
+
set(${theseTestsName}_h_files
|
42 |
+
../../../certs/certs.h
|
43 |
+
- ../../../deps/parson/parson.h
|
44 |
+
../common_dt_e2e/iothubclient_common_dt_e2e.h
|
45 |
+
)
|
46 |
+
|
47 |
+
diff --git a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
|
48 |
+
index d05d654..5872c8d 100644
|
49 |
+
--- a/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
|
50 |
+
+++ b/iothub_client/tests/iothubclient_mqtt_dt_e2e_sfc/CMakeLists.txt
|
51 |
+
@@ -22,12 +22,10 @@ set(${theseTestsName}_nuget_c_files
|
52 |
+
|
53 |
+
set(${theseTestsName}_c_files
|
54 |
+
../../../certs/certs.c
|
55 |
+
- ../../../deps/parson/parson.c
|
56 |
+
)
|
57 |
+
|
58 |
+
set(${theseTestsName}_h_files
|
59 |
+
../../../certs/certs.h
|
60 |
+
- ../../../deps/parson/parson.h
|
61 |
+
../common_dt_e2e/iothubclient_common_dt_e2e.h
|
62 |
+
)
|
63 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/portfile.cmake
ADDED
@@ -0,0 +1,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO Azure/azure-iot-sdk-c
|
6 |
+
REF 09d4e9ca46d1facea7d6d0c7ac13e56edd0a715f
|
7 |
+
SHA512 3b7e09320b6166ee1de8eae43c89e1fe0aa6733a1933f402d87b9e4edc3285eedbcf231cde1183e6ba3e4f0e392559eb803fa50da14a61a50e226875f3d283a0
|
8 |
+
HEAD_REF master
|
9 |
+
PATCHES
|
10 |
+
fix-install-location.patch
|
11 |
+
improve-external-deps.patch
|
12 |
+
fix-iothubclient-includes.patch
|
13 |
+
)
|
14 |
+
|
15 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
16 |
+
FEATURES
|
17 |
+
use-prov-client hsm_type_symm_key
|
18 |
+
use-prov-client use_prov_client
|
19 |
+
)
|
20 |
+
|
21 |
+
file(COPY "${CURRENT_INSTALLED_DIR}/share/azure-c-shared-utility/azure_iot_build_rules.cmake" DESTINATION "${SOURCE_PATH}/deps/azure-c-shared-utility/configs/")
|
22 |
+
file(COPY "${SOURCE_PATH}/configs/azure_iot_sdksFunctions.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/cmake/azure_iot_sdks/")
|
23 |
+
|
24 |
+
vcpkg_cmake_configure(
|
25 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
26 |
+
OPTIONS ${FEATURE_OPTIONS}
|
27 |
+
-Dskip_samples=ON
|
28 |
+
-Duse_installed_dependencies=ON
|
29 |
+
-Duse_default_uuid=ON
|
30 |
+
-Dbuild_as_dynamic=OFF
|
31 |
+
-Duse_edge_modules=ON
|
32 |
+
-Dwarnings_as_errors=OFF
|
33 |
+
-Dhsm_type_sastoken=OFF
|
34 |
+
MAYBE_UNUSED_VARIABLES
|
35 |
+
build_as_dynamic
|
36 |
+
warnings_as_errors
|
37 |
+
)
|
38 |
+
|
39 |
+
vcpkg_cmake_install()
|
40 |
+
|
41 |
+
vcpkg_cmake_config_fixup(PACKAGE_NAME azure_iot_sdks CONFIG_PATH "lib/cmake/azure_iot_sdks")
|
42 |
+
|
43 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
|
44 |
+
|
45 |
+
configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
|
46 |
+
|
47 |
+
vcpkg_copy_pdbs()
|
cc-multilingual-main/cc_net/vcpkg/ports/azure-iot-sdk-c/vcpkg.json
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "azure-iot-sdk-c",
|
3 |
+
"version-date": "2024-03-04",
|
4 |
+
"description": "A C99 SDK for connecting devices to Microsoft Azure IoT services",
|
5 |
+
"homepage": "https://github.com/Azure/azure-iot-sdk-c",
|
6 |
+
"license": "MIT",
|
7 |
+
"dependencies": [
|
8 |
+
"azure-c-shared-utility",
|
9 |
+
"azure-macro-utils-c",
|
10 |
+
"azure-uamqp-c",
|
11 |
+
"azure-uhttp-c",
|
12 |
+
"azure-umqtt-c",
|
13 |
+
"parson",
|
14 |
+
"umock-c",
|
15 |
+
{
|
16 |
+
"name": "vcpkg-cmake",
|
17 |
+
"host": true
|
18 |
+
},
|
19 |
+
{
|
20 |
+
"name": "vcpkg-cmake-config",
|
21 |
+
"host": true
|
22 |
+
}
|
23 |
+
]
|
24 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/bgfx/portfile.cmake
ADDED
@@ -0,0 +1,63 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_download_distfile(
|
2 |
+
ARCHIVE_FILE
|
3 |
+
URLS https://github.com/bkaradzic/bgfx.cmake/releases/download/v${VERSION}/bgfx.cmake.v${VERSION}.tar.gz
|
4 |
+
FILENAME bgfx.cmake.v${VERSION}.tar.gz
|
5 |
+
SHA512 369943ce0f8f2b5332d7334247d3a9ef0e28a6b1ff5ee250a01f83d1a0bd865687397da791e4c861d1c1b18ec4285f50153139f3c0e398611c7f3b672d1c751c
|
6 |
+
)
|
7 |
+
|
8 |
+
vcpkg_extract_source_archive(
|
9 |
+
SOURCE_PATH
|
10 |
+
ARCHIVE ${ARCHIVE_FILE}
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_check_features(
|
14 |
+
OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
15 |
+
FEATURES tools BGFX_BUILD_TOOLS multithreaded BGFX_CONFIG_MULTITHREADED
|
16 |
+
)
|
17 |
+
|
18 |
+
if (TARGET_TRIPLET MATCHES "(windows|uwp)")
|
19 |
+
# bgfx doesn't apply __declspec(dllexport) which prevents dynamic linking
|
20 |
+
set(BGFX_LIBRARY_TYPE "STATIC")
|
21 |
+
elseif (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
|
22 |
+
set(BGFX_LIBRARY_TYPE "SHARED")
|
23 |
+
else ()
|
24 |
+
set(BGFX_LIBRARY_TYPE "STATIC")
|
25 |
+
endif ()
|
26 |
+
|
27 |
+
file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-inject-packages.cmake" DESTINATION "${SOURCE_PATH}")
|
28 |
+
|
29 |
+
vcpkg_cmake_configure(
|
30 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
31 |
+
OPTIONS -DBGFX_LIBRARY_TYPE=${BGFX_LIBRARY_TYPE}
|
32 |
+
-DBX_AMALGAMATED=ON
|
33 |
+
-DBGFX_AMALGAMATED=ON
|
34 |
+
-DBGFX_BUILD_EXAMPLES=OFF
|
35 |
+
-DBGFX_OPENGLES_VERSION=30
|
36 |
+
-DBGFX_CMAKE_USER_SCRIPT=vcpkg-inject-packages.cmake
|
37 |
+
${FEATURE_OPTIONS}
|
38 |
+
)
|
39 |
+
|
40 |
+
vcpkg_cmake_install()
|
41 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
|
42 |
+
vcpkg_copy_pdbs()
|
43 |
+
|
44 |
+
if (BGFX_BUILD_TOOLS)
|
45 |
+
vcpkg_copy_tools(
|
46 |
+
TOOL_NAMES bin2c shaderc geometryc geometryv texturec texturev AUTO_CLEAN
|
47 |
+
)
|
48 |
+
endif ()
|
49 |
+
|
50 |
+
# Handle copyright
|
51 |
+
file(
|
52 |
+
INSTALL "${CURRENT_PACKAGES_DIR}/share/licences/${PORT}/LICENSE"
|
53 |
+
DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
|
54 |
+
RENAME copyright
|
55 |
+
)
|
56 |
+
|
57 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/licences"
|
58 |
+
"${CURRENT_PACKAGES_DIR}/debug/include"
|
59 |
+
"${CURRENT_PACKAGES_DIR}/debug/share"
|
60 |
+
)
|
61 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS)
|
62 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
63 |
+
endif()
|
cc-multilingual-main/cc_net/vcpkg/ports/bgfx/vcpkg-inject-packages.cmake
ADDED
@@ -0,0 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
find_package(miniz CONFIG REQUIRED)
|
2 |
+
set(MINIZ_LIBRARIES miniz::miniz)
|
3 |
+
|
4 |
+
find_package(unofficial-libsquish CONFIG REQUIRED)
|
5 |
+
set(LIBSQUISH_LIBRARIES unofficial::libsquish::squish)
|
6 |
+
|
7 |
+
find_package(tinyexr CONFIG REQUIRED)
|
8 |
+
set(TINYEXR_LIBRARIES unofficial::tinyexr::tinyexr)
|
cc-multilingual-main/cc_net/vcpkg/ports/bgfx/vcpkg.json
ADDED
@@ -0,0 +1,49 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "bgfx",
|
3 |
+
"version": "1.122.8595-458",
|
4 |
+
"maintainers": "Sandy Carter <[email protected]>",
|
5 |
+
"description": "Cross-platform, graphics API agnostic, Bring Your Own Engine/Framework style rendering library.",
|
6 |
+
"homepage": "https://bkaradzic.github.io/bgfx/overview.html",
|
7 |
+
"documentation": "https://bkaradzic.github.io/bgfx",
|
8 |
+
"license": "BSD-2-Clause",
|
9 |
+
"dependencies": [
|
10 |
+
"libsquish",
|
11 |
+
"miniz",
|
12 |
+
"tinyexr",
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake",
|
15 |
+
"host": true
|
16 |
+
},
|
17 |
+
{
|
18 |
+
"name": "vcpkg-cmake-config",
|
19 |
+
"host": true
|
20 |
+
}
|
21 |
+
],
|
22 |
+
"default-features": [
|
23 |
+
"platform-default-features"
|
24 |
+
],
|
25 |
+
"features": {
|
26 |
+
"multithreaded": {
|
27 |
+
"description": "Encode and render on different threads",
|
28 |
+
"supports": "!emscripten"
|
29 |
+
},
|
30 |
+
"platform-default-features": {
|
31 |
+
"description": "Enables default features per platform",
|
32 |
+
"dependencies": [
|
33 |
+
{
|
34 |
+
"$comment": "bgfx does not support multithreading on emscripten",
|
35 |
+
"name": "bgfx",
|
36 |
+
"features": [
|
37 |
+
"multithreaded"
|
38 |
+
],
|
39 |
+
"platform": "!emscripten"
|
40 |
+
}
|
41 |
+
]
|
42 |
+
},
|
43 |
+
"tools": {
|
44 |
+
"$comment": "Use '\"host\": true' in dependencies of vcpkg.json in manifest mode.",
|
45 |
+
"description": "Shader, Texture and Geometry compilers for bgfx.",
|
46 |
+
"supports": "native"
|
47 |
+
}
|
48 |
+
}
|
49 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/boost-process/portfile.cmake
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# Automatically generated by scripts/boost/generate-ports.ps1
|
2 |
+
|
3 |
+
vcpkg_from_github(
|
4 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
5 |
+
REPO boostorg/process
|
6 |
+
REF boost-${VERSION}
|
7 |
+
SHA512 cef528d676c3a909aff4175419dee7b2c13076d1d146e42d0840724dde31a8bce5ff3b8c22d4330dbc94ec70e8d3927c782997aa49b9d7262b309e7677c03436
|
8 |
+
HEAD_REF master
|
9 |
+
)
|
10 |
+
|
11 |
+
include(${CURRENT_INSTALLED_DIR}/share/boost-vcpkg-helpers/boost-modular-headers.cmake)
|
12 |
+
boost_modular_headers(SOURCE_PATH ${SOURCE_PATH})
|
cc-multilingual-main/cc_net/vcpkg/ports/configcat/portfile.cmake
ADDED
@@ -0,0 +1,31 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
2 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
3 |
+
endif()
|
4 |
+
|
5 |
+
vcpkg_from_github(
|
6 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
7 |
+
REPO configcat/cpp-sdk
|
8 |
+
REF "v${VERSION}"
|
9 |
+
SHA512 a71706978b0a4e7b4bce7f194910b75221bc6483d38f7cda9d004abdf41dcdd97aa2754977e641c888065f3aeacd6e7e0893e5de1c9417a3d466a977a1dbb287
|
10 |
+
HEAD_REF master
|
11 |
+
)
|
12 |
+
|
13 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
14 |
+
INVERTED_FEATURES
|
15 |
+
network CONFIGCAT_USE_EXTERNAL_NETWORK_ADAPTER
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_cmake_configure(
|
19 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
20 |
+
OPTIONS
|
21 |
+
-DCONFIGCAT_BUILD_TESTS=OFF
|
22 |
+
${FEATURE_OPTIONS}
|
23 |
+
)
|
24 |
+
vcpkg_cmake_install()
|
25 |
+
|
26 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH "share/cmake/configcat")
|
27 |
+
|
28 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
29 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
30 |
+
|
31 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
cc-multilingual-main/cc_net/vcpkg/ports/configcat/vcpkg.json
ADDED
@@ -0,0 +1,41 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "configcat",
|
3 |
+
"version": "3.2.0",
|
4 |
+
"description": "ConfigCat SDK for C++ provides easy integration for your application to ConfigCat. ConfigCat is a feature flag and configuration management service that lets you separate feature releases from deployments. Alternative to LaunchDarkly.",
|
5 |
+
"homepage": "https://configcat.com/",
|
6 |
+
"license": "MIT",
|
7 |
+
"dependencies": [
|
8 |
+
"hash-library",
|
9 |
+
"nlohmann-json",
|
10 |
+
{
|
11 |
+
"name": "vcpkg-cmake",
|
12 |
+
"host": true
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake-config",
|
16 |
+
"host": true
|
17 |
+
},
|
18 |
+
"z4kn4fein-semver"
|
19 |
+
],
|
20 |
+
"default-features": [
|
21 |
+
"network"
|
22 |
+
],
|
23 |
+
"features": {
|
24 |
+
"network": {
|
25 |
+
"description": "Use built-in curl network adapter",
|
26 |
+
"dependencies": [
|
27 |
+
{
|
28 |
+
"name": "curl",
|
29 |
+
"default-features": false,
|
30 |
+
"features": [
|
31 |
+
"ssl"
|
32 |
+
]
|
33 |
+
},
|
34 |
+
{
|
35 |
+
"name": "openssl",
|
36 |
+
"platform": "linux"
|
37 |
+
}
|
38 |
+
]
|
39 |
+
}
|
40 |
+
}
|
41 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/eigen3/fix-vectorized-reductions-half.patch
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/Eigen/src/Core/PartialReduxEvaluator.h b/Eigen/src/Core/PartialReduxEvaluator.h
|
2 |
+
index 29abf35..4051fcf 100644
|
3 |
+
--- a/Eigen/src/Core/PartialReduxEvaluator.h
|
4 |
+
+++ b/Eigen/src/Core/PartialReduxEvaluator.h
|
5 |
+
@@ -54,12 +54,19 @@ struct packetwise_redux_traits
|
6 |
+
/* Value to be returned when size==0 , by default let's return 0 */
|
7 |
+
template<typename PacketType,typename Func>
|
8 |
+
EIGEN_DEVICE_FUNC
|
9 |
+
-PacketType packetwise_redux_empty_value(const Func& ) { return pset1<PacketType>(0); }
|
10 |
+
+PacketType packetwise_redux_empty_value(const Func& ) {
|
11 |
+
+ const typename unpacket_traits<PacketType>::type zero(0);
|
12 |
+
+ return pset1<PacketType>(zero);
|
13 |
+
+}
|
14 |
+
+
|
15 |
+
|
16 |
+
/* For products the default is 1 */
|
17 |
+
template<typename PacketType,typename Scalar>
|
18 |
+
EIGEN_DEVICE_FUNC
|
19 |
+
-PacketType packetwise_redux_empty_value(const scalar_product_op<Scalar,Scalar>& ) { return pset1<PacketType>(1); }
|
20 |
+
+PacketType packetwise_redux_empty_value(const scalar_product_op<Scalar,Scalar>& ) {
|
21 |
+
+ return pset1<PacketType>(Scalar(1));
|
22 |
+
+}
|
23 |
+
+
|
24 |
+
|
25 |
+
/* Perform the actual reduction */
|
26 |
+
template<typename Func, typename Evaluator,
|
cc-multilingual-main/cc_net/vcpkg/ports/eigen3/portfile.cmake
ADDED
@@ -0,0 +1,42 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_buildpath_length_warning(37)
|
2 |
+
|
3 |
+
block(SCOPE_FOR VARIABLES PROPAGATE SOURCE_PATH)
|
4 |
+
set(VCPKG_BUILD_TYPE release) # header-only
|
5 |
+
|
6 |
+
vcpkg_from_gitlab(
|
7 |
+
GITLAB_URL https://gitlab.com
|
8 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
9 |
+
REPO libeigen/eigen
|
10 |
+
REF "${VERSION}"
|
11 |
+
SHA512 ba75ecb760e32acf4ceaf27115468e65d4f77c44f8d519b5a13e7940af2c03a304ad433368cb6d55431f307c5c39e2666ab41d34442db3cf441638e51f5c3b6a
|
12 |
+
HEAD_REF master
|
13 |
+
PATCHES
|
14 |
+
remove_configure_checks.patch # This removes unnecessary configure checks. Eigen3 just installs headers not anything more.
|
15 |
+
fix-vectorized-reductions-half.patch # Remove this patch in the next update
|
16 |
+
)
|
17 |
+
|
18 |
+
vcpkg_cmake_configure(
|
19 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
20 |
+
OPTIONS
|
21 |
+
-DBUILD_TESTING=OFF
|
22 |
+
-DEIGEN_BUILD_DOC=OFF
|
23 |
+
-DEIGEN_BUILD_PKGCONFIG=ON
|
24 |
+
"-DCMAKEPACKAGE_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/share/eigen3"
|
25 |
+
"-DPKGCONFIG_INSTALL_DIR=${CURRENT_PACKAGES_DIR}/lib/pkgconfig"
|
26 |
+
)
|
27 |
+
|
28 |
+
vcpkg_cmake_install()
|
29 |
+
vcpkg_cmake_config_fixup()
|
30 |
+
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/eigen3/Eigen3Config.cmake" "if (NOT TARGET eigen)" "if (NOT TARGET Eigen3::Eigen)")
|
31 |
+
endblock()
|
32 |
+
|
33 |
+
if(NOT VCPKG_BUILD_TYPE)
|
34 |
+
file(INSTALL "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/eigen3.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
|
35 |
+
endif()
|
36 |
+
vcpkg_fixup_pkgconfig()
|
37 |
+
|
38 |
+
file(GLOB INCLUDES "${CURRENT_PACKAGES_DIR}/include/eigen3/*")
|
39 |
+
# Copy the eigen header files to conventional location for user-wide MSBuild integration
|
40 |
+
file(COPY ${INCLUDES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
|
41 |
+
|
42 |
+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING.README")
|
cc-multilingual-main/cc_net/vcpkg/ports/eigen3/remove_configure_checks.patch
ADDED
@@ -0,0 +1,48 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index f3e69b8..f32ffee 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -59,6 +59,7 @@ include(CheckCXXCompilerFlag)
|
6 |
+
include(GNUInstallDirs)
|
7 |
+
include(CMakeDependentOption)
|
8 |
+
|
9 |
+
+if(0)
|
10 |
+
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
|
11 |
+
|
12 |
+
|
13 |
+
@@ -419,6 +420,7 @@ endif()
|
14 |
+
set(EIGEN_CUDA_COMPUTE_ARCH 30 CACHE STRING "The CUDA compute architecture level to target when compiling CUDA code")
|
15 |
+
|
16 |
+
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
17 |
+
+endif()
|
18 |
+
|
19 |
+
# Backward compatibility support for EIGEN_INCLUDE_INSTALL_DIR
|
20 |
+
if(EIGEN_INCLUDE_INSTALL_DIR)
|
21 |
+
@@ -495,6 +497,7 @@ if(BUILD_TESTING)
|
22 |
+
add_subdirectory(failtest)
|
23 |
+
endif()
|
24 |
+
|
25 |
+
+if(0)
|
26 |
+
if(EIGEN_LEAVE_TEST_IN_ALL_TARGET)
|
27 |
+
add_subdirectory(blas)
|
28 |
+
add_subdirectory(lapack)
|
29 |
+
@@ -532,9 +535,11 @@ if(EIGEN_TEST_SYCL)
|
30 |
+
add_definitions(-DEIGEN_DONT_VECTORIZE_SYCL=1)
|
31 |
+
endif()
|
32 |
+
endif()
|
33 |
+
+endif()
|
34 |
+
|
35 |
+
add_subdirectory(unsupported)
|
36 |
+
|
37 |
+
+if(0)
|
38 |
+
add_subdirectory(demos EXCLUDE_FROM_ALL)
|
39 |
+
|
40 |
+
# must be after test and unsupported, for configuring buildtests.in
|
41 |
+
@@ -554,6 +559,7 @@ configure_file(scripts/cdashtesting.cmake.in cdashtesting.cmake @ONLY)
|
42 |
+
if(BUILD_TESTING)
|
43 |
+
ei_testing_print_summary()
|
44 |
+
endif()
|
45 |
+
+endif()
|
46 |
+
|
47 |
+
message(STATUS "")
|
48 |
+
message(STATUS "Configured Eigen ${EIGEN_VERSION_NUMBER}")
|
cc-multilingual-main/cc_net/vcpkg/ports/eigen3/vcpkg.json
ADDED
@@ -0,0 +1,18 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "eigen3",
|
3 |
+
"version": "3.4.0",
|
4 |
+
"port-version": 4,
|
5 |
+
"description": "C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms.",
|
6 |
+
"homepage": "http://eigen.tuxfamily.org",
|
7 |
+
"license": "MPL-2.0",
|
8 |
+
"dependencies": [
|
9 |
+
{
|
10 |
+
"name": "vcpkg-cmake",
|
11 |
+
"host": true
|
12 |
+
},
|
13 |
+
{
|
14 |
+
"name": "vcpkg-cmake-config",
|
15 |
+
"host": true
|
16 |
+
}
|
17 |
+
]
|
18 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/folly/disable-non-underscore-posix-names.patch
ADDED
@@ -0,0 +1,34 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/folly/portability/Windows.h b/folly/portability/Windows.h
|
2 |
+
index 86fd0f9..ccad11e 100644
|
3 |
+
--- a/folly/portability/Windows.h
|
4 |
+
+++ b/folly/portability/Windows.h
|
5 |
+
@@ -32,24 +32,17 @@
|
6 |
+
// disabled to ensure all of the normal names get declared properly.
|
7 |
+
#include <stdio.h>
|
8 |
+
|
9 |
+
-#ifndef __STDC__
|
10 |
+
-/* nolint */
|
11 |
+
-#define __STDC__ 1
|
12 |
+
#pragma push_macro("_CRT_DECLARE_NONSTDC_NAMES")
|
13 |
+
#ifdef _CRT_DECLARE_NONSTDC_NAMES
|
14 |
+
#undef _CRT_DECLARE_NONSTDC_NAMES
|
15 |
+
#endif
|
16 |
+
+
|
17 |
+
+#include <corecrt.h>
|
18 |
+
#pragma push_macro("_CRT_INTERNAL_NONSTDC_NAMES")
|
19 |
+
-#undef _CRT_INTERNAL_NONSTDC_NAMES
|
20 |
+
-#include <direct.h> // @manual nolint
|
21 |
+
-#include <io.h> // @manual nolint
|
22 |
+
-#undef __STDC__
|
23 |
+
+#define _CRT_INTERNAL_NONSTDC_NAMES 0
|
24 |
+
+#include <direct.h>
|
25 |
+
+#include <io.h>
|
26 |
+
#pragma pop_macro("_CRT_INTERNAL_NONSTDC_NAMES")
|
27 |
+
-#pragma pop_macro("_CRT_DECLARE_NONSTDC_NAMES")
|
28 |
+
-#else
|
29 |
+
-#include <direct.h> // @manual nolint
|
30 |
+
-#include <io.h> // @manual nolint
|
31 |
+
-#endif
|
32 |
+
|
33 |
+
#if defined(min) || defined(max)
|
34 |
+
#error Windows.h needs to be included by this header, or else NOMINMAX needs \
|
cc-multilingual-main/cc_net/vcpkg/ports/folly/fix-deps.patch
ADDED
@@ -0,0 +1,210 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMake/folly-config.cmake.in b/CMake/folly-config.cmake.in
|
2 |
+
index 1689f9a..e5d3e22 100644
|
3 |
+
--- a/CMake/folly-config.cmake.in
|
4 |
+
+++ b/CMake/folly-config.cmake.in
|
5 |
+
@@ -28,10 +28,35 @@ endif()
|
6 |
+
set(FOLLY_LIBRARIES Folly::folly)
|
7 |
+
|
8 |
+
# Find folly's dependencies
|
9 |
+
-find_dependency(fmt)
|
10 |
+
+find_dependency(double-conversion CONFIG)
|
11 |
+
+find_dependency(glog CONFIG)
|
12 |
+
+find_dependency(gflags CONFIG)
|
13 |
+
+find_dependency(Libevent CONFIG)
|
14 |
+
+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_Zstd@)
|
15 |
+
+ find_dependency(zstd CONFIG)
|
16 |
+
+endif()
|
17 |
+
+if (@CMAKE_REQUIRE_FIND_PACKAGE_ZLIB@)
|
18 |
+
+ find_dependency(ZLIB MODULE)
|
19 |
+
+endif()
|
20 |
+
+find_dependency(OpenSSL MODULE)
|
21 |
+
+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium@)
|
22 |
+
+ find_dependency(unofficial-sodium CONFIG)
|
23 |
+
+endif()
|
24 |
+
+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_Snappy@)
|
25 |
+
+ find_dependency(Snappy CONFIG)
|
26 |
+
+endif()
|
27 |
+
+if (NOT @CMAKE_DISABLE_FIND_PACKAGE_LZ4@)
|
28 |
+
+ find_dependency(lz4 CONFIG)
|
29 |
+
+endif()
|
30 |
+
+
|
31 |
+
+if (@WITH_liburing@)
|
32 |
+
+ find_dependency(LibUring)
|
33 |
+
+endif()
|
34 |
+
+
|
35 |
+
+find_dependency(fmt CONFIG)
|
36 |
+
|
37 |
+
set(Boost_USE_STATIC_LIBS "@FOLLY_BOOST_LINK_STATIC@")
|
38 |
+
-find_dependency(Boost 1.51.0 MODULE
|
39 |
+
+find_dependency(Boost
|
40 |
+
COMPONENTS
|
41 |
+
context
|
42 |
+
filesystem
|
43 |
+
diff --git a/CMake/folly-deps.cmake b/CMake/folly-deps.cmake
|
44 |
+
index 4b78e9f..ac83c99 100644
|
45 |
+
--- a/CMake/folly-deps.cmake
|
46 |
+
+++ b/CMake/folly-deps.cmake
|
47 |
+
@@ -35,7 +35,7 @@ else()
|
48 |
+
endif()
|
49 |
+
set(Boost_USE_STATIC_LIBS "${FOLLY_BOOST_LINK_STATIC}")
|
50 |
+
|
51 |
+
-find_package(Boost 1.51.0 MODULE
|
52 |
+
+find_package(Boost
|
53 |
+
COMPONENTS
|
54 |
+
context
|
55 |
+
filesystem
|
56 |
+
@@ -45,37 +45,38 @@ find_package(Boost 1.51.0 MODULE
|
57 |
+
thread
|
58 |
+
REQUIRED
|
59 |
+
)
|
60 |
+
+set (Boost_LIBRARIES Boost::boost Boost::context Boost::filesystem Boost::program_options Boost::regex Boost::system Boost::thread
|
61 |
+
+ )
|
62 |
+
list(APPEND FOLLY_LINK_LIBRARIES ${Boost_LIBRARIES})
|
63 |
+
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS})
|
64 |
+
|
65 |
+
-find_package(DoubleConversion MODULE REQUIRED)
|
66 |
+
-list(APPEND FOLLY_LINK_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY})
|
67 |
+
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${DOUBLE_CONVERSION_INCLUDE_DIR})
|
68 |
+
+find_package(double-conversion CONFIG REQUIRED)
|
69 |
+
+list(APPEND FOLLY_LINK_LIBRARIES double-conversion::double-conversion)
|
70 |
+
|
71 |
+
-find_package(Glog CONFIG REQUIRED)
|
72 |
+
-set(FOLLY_HAVE_LIBGLOG ${GLOG_FOUND})
|
73 |
+
+find_package(glog CONFIG REQUIRED)
|
74 |
+
+set(FOLLY_HAVE_LIBGLOG 1)
|
75 |
+
list(APPEND FOLLY_LINK_LIBRARIES glog::glog)
|
76 |
+
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${GLOG_INCLUDE_DIR})
|
77 |
+
-
|
78 |
+
-find_package(Gflags MODULE)
|
79 |
+
-set(FOLLY_HAVE_LIBGFLAGS ${LIBGFLAGS_FOUND})
|
80 |
+
-if(LIBGFLAGS_FOUND)
|
81 |
+
- list(APPEND FOLLY_LINK_LIBRARIES ${LIBGFLAGS_LIBRARY})
|
82 |
+
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBGFLAGS_INCLUDE_DIR})
|
83 |
+
- set(FOLLY_LIBGFLAGS_LIBRARY ${LIBGFLAGS_LIBRARY})
|
84 |
+
- set(FOLLY_LIBGFLAGS_INCLUDE ${LIBGFLAGS_INCLUDE_DIR})
|
85 |
+
+
|
86 |
+
+find_package(gflags CONFIG)
|
87 |
+
+if(TARGET gflags::gflags)
|
88 |
+
+ set(FOLLY_HAVE_LIBGFLAGS 1)
|
89 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES gflags::gflags)
|
90 |
+
+ set(FOLLY_LIBGFLAGS_LIBRARY gflags::gflags)
|
91 |
+
endif()
|
92 |
+
|
93 |
+
-find_package(LibEvent MODULE REQUIRED)
|
94 |
+
-list(APPEND FOLLY_LINK_LIBRARIES ${LIBEVENT_LIB})
|
95 |
+
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBEVENT_INCLUDE_DIR})
|
96 |
+
+find_package(Libevent CONFIG REQUIRED)
|
97 |
+
+list(APPEND FOLLY_LINK_LIBRARIES libevent::core libevent::extra)
|
98 |
+
+if(NOT WIN32)
|
99 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES libevent::pthreads)
|
100 |
+
+endif()
|
101 |
+
|
102 |
+
-find_package(ZLIB MODULE)
|
103 |
+
-set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
|
104 |
+
-if (ZLIB_FOUND)
|
105 |
+
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
|
106 |
+
- list(APPEND FOLLY_LINK_LIBRARIES ${ZLIB_LIBRARIES})
|
107 |
+
- list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
|
108 |
+
+if (CMAKE_REQUIRE_FIND_PACKAGE_ZLIB)
|
109 |
+
+ find_package(ZLIB MODULE REQUIRED)
|
110 |
+
+ set(FOLLY_HAVE_LIBZ ${ZLIB_FOUND})
|
111 |
+
+ if (ZLIB_FOUND)
|
112 |
+
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRS})
|
113 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES ${ZLIB_LIBRARIES})
|
114 |
+
+ list(APPEND CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
|
115 |
+
+ endif()
|
116 |
+
endif()
|
117 |
+
|
118 |
+
find_package(OpenSSL 1.1.1 MODULE REQUIRED)
|
119 |
+
@@ -104,25 +105,29 @@ if (LIBLZMA_FOUND)
|
120 |
+
list(APPEND FOLLY_LINK_LIBRARIES ${LIBLZMA_LIBRARIES})
|
121 |
+
endif()
|
122 |
+
|
123 |
+
-find_package(LZ4 MODULE)
|
124 |
+
-set(FOLLY_HAVE_LIBLZ4 ${LZ4_FOUND})
|
125 |
+
-if (LZ4_FOUND)
|
126 |
+
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LZ4_INCLUDE_DIR})
|
127 |
+
- list(APPEND FOLLY_LINK_LIBRARIES ${LZ4_LIBRARY})
|
128 |
+
+if (NOT CMAKE_DISABLE_FIND_PACKAGE_LZ4)
|
129 |
+
+ find_package(lz4 CONFIG)
|
130 |
+
+ if(TARGET lz4::lz4)
|
131 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES lz4::lz4)
|
132 |
+
+ endif()
|
133 |
+
endif()
|
134 |
+
|
135 |
+
-find_package(Zstd MODULE)
|
136 |
+
-set(FOLLY_HAVE_LIBZSTD ${ZSTD_FOUND})
|
137 |
+
-if(ZSTD_FOUND)
|
138 |
+
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${ZSTD_INCLUDE_DIR})
|
139 |
+
- list(APPEND FOLLY_LINK_LIBRARIES ${ZSTD_LIBRARY})
|
140 |
+
+if (NOT CMAKE_DISABLE_FIND_PACKAGE_Zstd)
|
141 |
+
+ find_package(zstd CONFIG)
|
142 |
+
+ if(TARGET zstd::libzstd_shared )
|
143 |
+
+ set(FOLLY_HAVE_LIBZSTD 1)
|
144 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES zstd::libzstd_shared)
|
145 |
+
+ elseif( TARGET zstd::libzstd_static )
|
146 |
+
+ set(FOLLY_HAVE_LIBZSTD 1)
|
147 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES zstd::libzstd_static)
|
148 |
+
+ endif()
|
149 |
+
endif()
|
150 |
+
|
151 |
+
-find_package(Snappy MODULE)
|
152 |
+
-set(FOLLY_HAVE_LIBSNAPPY ${SNAPPY_FOUND})
|
153 |
+
-if (SNAPPY_FOUND)
|
154 |
+
- list(APPEND FOLLY_INCLUDE_DIRECTORIES ${SNAPPY_INCLUDE_DIR})
|
155 |
+
- list(APPEND FOLLY_LINK_LIBRARIES ${SNAPPY_LIBRARY})
|
156 |
+
+if (NOT CMAKE_DISABLE_FIND_PACKAGE_Snappy)
|
157 |
+
+ find_package(Snappy CONFIG)
|
158 |
+
+ if(TARGET Snappy::snappy)
|
159 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES Snappy::snappy)
|
160 |
+
+ endif()
|
161 |
+
endif()
|
162 |
+
|
163 |
+
find_package(LibDwarf)
|
164 |
+
@@ -137,13 +142,18 @@ find_package(LibAIO)
|
165 |
+
list(APPEND FOLLY_LINK_LIBRARIES ${LIBAIO_LIBRARIES})
|
166 |
+
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBAIO_INCLUDE_DIRS})
|
167 |
+
|
168 |
+
+if(WITH_liburing)
|
169 |
+
find_package(LibUring)
|
170 |
+
list(APPEND FOLLY_LINK_LIBRARIES ${LIBURING_LIBRARIES})
|
171 |
+
list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBURING_INCLUDE_DIRS})
|
172 |
+
+endif()
|
173 |
+
|
174 |
+
-find_package(Libsodium)
|
175 |
+
-list(APPEND FOLLY_LINK_LIBRARIES ${LIBSODIUM_LIBRARIES})
|
176 |
+
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBSODIUM_INCLUDE_DIRS})
|
177 |
+
+if (NOT CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium)
|
178 |
+
+ find_package(unofficial-sodium CONFIG)
|
179 |
+
+ if(TARGET unofficial-sodium::sodium)
|
180 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES unofficial-sodium::sodium)
|
181 |
+
+ endif()
|
182 |
+
+endif()
|
183 |
+
|
184 |
+
list(APPEND FOLLY_LINK_LIBRARIES ${CMAKE_DL_LIBS})
|
185 |
+
list(APPEND CMAKE_REQUIRED_LIBRARIES ${CMAKE_DL_LIBS})
|
186 |
+
@@ -154,9 +164,9 @@ if (PYTHON_EXTENSIONS)
|
187 |
+
endif ()
|
188 |
+
|
189 |
+
find_package(LibUnwind)
|
190 |
+
-list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
|
191 |
+
-list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
|
192 |
+
if (LIBUNWIND_FOUND)
|
193 |
+
+ list(APPEND FOLLY_LINK_LIBRARIES ${LIBUNWIND_LIBRARIES})
|
194 |
+
+ list(APPEND FOLLY_INCLUDE_DIRECTORIES ${LIBUNWIND_INCLUDE_DIRS})
|
195 |
+
set(FOLLY_HAVE_LIBUNWIND ON)
|
196 |
+
endif()
|
197 |
+
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
198 |
+
@@ -299,11 +309,7 @@ endif()
|
199 |
+
|
200 |
+
add_library(folly_deps INTERFACE)
|
201 |
+
|
202 |
+
-find_package(fmt CONFIG)
|
203 |
+
-if (NOT DEFINED fmt_CONFIG)
|
204 |
+
- # Fallback on a normal search on the current system
|
205 |
+
- find_package(Fmt MODULE REQUIRED)
|
206 |
+
-endif()
|
207 |
+
+find_package(fmt CONFIG REQUIRED)
|
208 |
+
target_link_libraries(folly_deps INTERFACE fmt::fmt)
|
209 |
+
|
210 |
+
list(REMOVE_DUPLICATES FOLLY_INCLUDE_DIRECTORIES)
|
cc-multilingual-main/cc_net/vcpkg/ports/folly/portfile.cmake
ADDED
@@ -0,0 +1,96 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
2 |
+
|
3 |
+
# Required to run build/generate_escape_tables.py et al.
|
4 |
+
vcpkg_find_acquire_program(PYTHON3)
|
5 |
+
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
|
6 |
+
vcpkg_add_to_path("${PYTHON3_DIR}")
|
7 |
+
|
8 |
+
vcpkg_from_github(
|
9 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
10 |
+
REPO facebook/folly
|
11 |
+
REF "v${VERSION}"
|
12 |
+
SHA512 c563aa64efa3098235db5f6354cdbc96d829f8bfc24e24464e0cae65279d00f1bba722c7060c2e76c89723ef66ef94225a02d6fb65e24fa6125adb619fc1d74b
|
13 |
+
HEAD_REF main
|
14 |
+
PATCHES
|
15 |
+
reorder-glog-gflags.patch
|
16 |
+
disable-non-underscore-posix-names.patch
|
17 |
+
boost-1.70.patch
|
18 |
+
fix-windows-minmax.patch
|
19 |
+
fix-deps.patch
|
20 |
+
openssl.patch # from https://github.com/facebook/folly/pull/2016
|
21 |
+
disable-uninitialized-resize-on-new-stl.patch
|
22 |
+
fix-unistd-include.patch
|
23 |
+
)
|
24 |
+
|
25 |
+
file(REMOVE "${SOURCE_PATH}/CMake/FindFmt.cmake")
|
26 |
+
file(REMOVE "${SOURCE_PATH}/CMake/FindLibsodium.cmake")
|
27 |
+
file(REMOVE "${SOURCE_PATH}/CMake/FindZstd.cmake")
|
28 |
+
file(REMOVE "${SOURCE_PATH}/CMake/FindSnappy.cmake")
|
29 |
+
file(REMOVE "${SOURCE_PATH}/CMake/FindLZ4.cmake")
|
30 |
+
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindDoubleConversion.cmake")
|
31 |
+
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGMock.cmake")
|
32 |
+
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGflags.cmake")
|
33 |
+
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindGlog.cmake")
|
34 |
+
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibEvent.cmake")
|
35 |
+
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindLibUnwind.cmake")
|
36 |
+
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindSodium.cmake")
|
37 |
+
file(REMOVE "${SOURCE_PATH}/build/fbcode_builder/CMake/FindZstd.cmake")
|
38 |
+
|
39 |
+
if(VCPKG_CRT_LINKAGE STREQUAL static)
|
40 |
+
set(MSVC_USE_STATIC_RUNTIME ON)
|
41 |
+
else()
|
42 |
+
set(MSVC_USE_STATIC_RUNTIME OFF)
|
43 |
+
endif()
|
44 |
+
|
45 |
+
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
46 |
+
FEATURES
|
47 |
+
"zlib" CMAKE_REQUIRE_FIND_PACKAGE_ZLIB
|
48 |
+
"liburing" WITH_liburing
|
49 |
+
INVERTED_FEATURES
|
50 |
+
"bzip2" CMAKE_DISABLE_FIND_PACKAGE_BZip2
|
51 |
+
"lzma" CMAKE_DISABLE_FIND_PACKAGE_LibLZMA
|
52 |
+
"lz4" CMAKE_DISABLE_FIND_PACKAGE_LZ4
|
53 |
+
"zstd" CMAKE_DISABLE_FIND_PACKAGE_Zstd
|
54 |
+
"snappy" CMAKE_DISABLE_FIND_PACKAGE_Snappy
|
55 |
+
"libsodium" CMAKE_DISABLE_FIND_PACKAGE_unofficial-sodium
|
56 |
+
)
|
57 |
+
|
58 |
+
vcpkg_cmake_configure(
|
59 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
60 |
+
OPTIONS
|
61 |
+
-DMSVC_USE_STATIC_RUNTIME=${MSVC_USE_STATIC_RUNTIME}
|
62 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_LibDwarf=ON
|
63 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_Libiberty=ON
|
64 |
+
-DCMAKE_DISABLE_FIND_PACKAGE_LibAIO=ON
|
65 |
+
-DLIBAIO_FOUND=OFF
|
66 |
+
-DCMAKE_INSTALL_DIR=share/folly
|
67 |
+
${FEATURE_OPTIONS}
|
68 |
+
MAYBE_UNUSED_VARIABLES
|
69 |
+
LIBAIO_FOUND
|
70 |
+
MSVC_USE_STATIC_RUNTIME
|
71 |
+
)
|
72 |
+
|
73 |
+
vcpkg_cmake_install(ADD_BIN_TO_PATH)
|
74 |
+
|
75 |
+
vcpkg_copy_pdbs()
|
76 |
+
|
77 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
|
78 |
+
|
79 |
+
vcpkg_cmake_config_fixup()
|
80 |
+
|
81 |
+
# Release folly-targets.cmake does not link to the right libraries in debug mode.
|
82 |
+
# We substitute with generator expressions so that the right libraries are linked for debug and release.
|
83 |
+
set(FOLLY_TARGETS_CMAKE "${CURRENT_PACKAGES_DIR}/share/folly/folly-targets.cmake")
|
84 |
+
FILE(READ ${FOLLY_TARGETS_CMAKE} _contents)
|
85 |
+
string(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/zlib.lib" "ZLIB::ZLIB" _contents "${_contents}")
|
86 |
+
STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/lib/" "\${VCPKG_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
|
87 |
+
STRING(REPLACE "\${VCPKG_IMPORT_PREFIX}/debug/lib/" "\${VCPKG_IMPORT_PREFIX}/\$<\$<CONFIG:DEBUG>:debug/>lib/" _contents "${_contents}")
|
88 |
+
string(REPLACE "-vc140-mt.lib" "-vc140-mt\$<\$<CONFIG:DEBUG>:-gd>.lib" _contents "${_contents}")
|
89 |
+
FILE(WRITE ${FOLLY_TARGETS_CMAKE} "${_contents}")
|
90 |
+
|
91 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
92 |
+
|
93 |
+
# Handle copyright
|
94 |
+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
95 |
+
|
96 |
+
vcpkg_fixup_pkgconfig()
|
cc-multilingual-main/cc_net/vcpkg/ports/folly/vcpkg.json
ADDED
@@ -0,0 +1,91 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "folly",
|
3 |
+
"version-string": "2024.01.01.00",
|
4 |
+
"port-version": 2,
|
5 |
+
"description": "An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows",
|
6 |
+
"homepage": "https://github.com/facebook/folly",
|
7 |
+
"license": "Apache-2.0",
|
8 |
+
"supports": "(windows & x64 & !uwp) | (!windows & (x64 | arm64))",
|
9 |
+
"dependencies": [
|
10 |
+
"boost-chrono",
|
11 |
+
"boost-context",
|
12 |
+
"boost-conversion",
|
13 |
+
"boost-crc",
|
14 |
+
"boost-date-time",
|
15 |
+
"boost-filesystem",
|
16 |
+
"boost-multi-index",
|
17 |
+
"boost-program-options",
|
18 |
+
"boost-regex",
|
19 |
+
"boost-smart-ptr",
|
20 |
+
"boost-system",
|
21 |
+
"boost-thread",
|
22 |
+
"boost-variant",
|
23 |
+
"double-conversion",
|
24 |
+
"fmt",
|
25 |
+
"gflags",
|
26 |
+
"glog",
|
27 |
+
"libevent",
|
28 |
+
"openssl",
|
29 |
+
{
|
30 |
+
"name": "vcpkg-cmake",
|
31 |
+
"host": true
|
32 |
+
},
|
33 |
+
{
|
34 |
+
"name": "vcpkg-cmake-config",
|
35 |
+
"host": true
|
36 |
+
}
|
37 |
+
],
|
38 |
+
"default-features": [
|
39 |
+
"zlib"
|
40 |
+
],
|
41 |
+
"features": {
|
42 |
+
"bzip2": {
|
43 |
+
"description": "Support bzip2 for compression",
|
44 |
+
"dependencies": [
|
45 |
+
"bzip2"
|
46 |
+
]
|
47 |
+
},
|
48 |
+
"libsodium": {
|
49 |
+
"description": "Support libsodium for cryto",
|
50 |
+
"dependencies": [
|
51 |
+
"libsodium"
|
52 |
+
]
|
53 |
+
},
|
54 |
+
"liburing": {
|
55 |
+
"description": "Support compile with liburing",
|
56 |
+
"dependencies": [
|
57 |
+
"liburing"
|
58 |
+
]
|
59 |
+
},
|
60 |
+
"lz4": {
|
61 |
+
"description": "Support lz4 for compression",
|
62 |
+
"dependencies": [
|
63 |
+
"lz4"
|
64 |
+
]
|
65 |
+
},
|
66 |
+
"lzma": {
|
67 |
+
"description": "Support LZMA for compression",
|
68 |
+
"dependencies": [
|
69 |
+
"liblzma"
|
70 |
+
]
|
71 |
+
},
|
72 |
+
"snappy": {
|
73 |
+
"description": "Support Snappy for compression",
|
74 |
+
"dependencies": [
|
75 |
+
"snappy"
|
76 |
+
]
|
77 |
+
},
|
78 |
+
"zlib": {
|
79 |
+
"description": "Support zlib for compression",
|
80 |
+
"dependencies": [
|
81 |
+
"zlib"
|
82 |
+
]
|
83 |
+
},
|
84 |
+
"zstd": {
|
85 |
+
"description": "Support zstd for compression",
|
86 |
+
"dependencies": [
|
87 |
+
"zstd"
|
88 |
+
]
|
89 |
+
}
|
90 |
+
}
|
91 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/hnswlib/portfile.cmake
ADDED
@@ -0,0 +1,22 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO nmslib/hnswlib
|
4 |
+
REF "v${VERSION}"
|
5 |
+
SHA512 2bac86547374ef762083f33b5209c7c02c89b3270442dda2bc80fbc7b6a33766cb81248841deddc2ca1f7c49e3e19889955f45c91d0b601d1c883a5e1c930794
|
6 |
+
HEAD_REF master
|
7 |
+
)
|
8 |
+
|
9 |
+
set(VCPKG_BUILD_TYPE "release") # header-only port
|
10 |
+
|
11 |
+
vcpkg_cmake_configure(
|
12 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
13 |
+
OPTIONS
|
14 |
+
-DHNSWLIB_EXAMPLES=OFF
|
15 |
+
)
|
16 |
+
|
17 |
+
vcpkg_cmake_install()
|
18 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/hnswlib)
|
19 |
+
|
20 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
|
21 |
+
|
22 |
+
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
cc-multilingual-main/cc_net/vcpkg/ports/hnswlib/vcpkg.json
ADDED
@@ -0,0 +1,17 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "hnswlib",
|
3 |
+
"version": "0.8.0",
|
4 |
+
"description": "Header-only library for fast approximate nearest neighbors",
|
5 |
+
"homepage": "https://github.com/nmslib/hnswlib",
|
6 |
+
"license": "Apache-2.0",
|
7 |
+
"dependencies": [
|
8 |
+
{
|
9 |
+
"name": "vcpkg-cmake",
|
10 |
+
"host": true
|
11 |
+
},
|
12 |
+
{
|
13 |
+
"name": "vcpkg-cmake-config",
|
14 |
+
"host": true
|
15 |
+
}
|
16 |
+
]
|
17 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/ijg-libjpeg/CMakeLists.txt
ADDED
@@ -0,0 +1,65 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
cmake_minimum_required(VERSION 3.13)
|
2 |
+
project(libjpeg LANGUAGES C)
|
3 |
+
|
4 |
+
option(BUILD_EXECUTABLES OFF)
|
5 |
+
|
6 |
+
#
|
7 |
+
# jconfig.h is a public header, so it must be genrated. Please reference the install.txt in jpegsr9d.zip
|
8 |
+
#
|
9 |
+
# jconfig.txt should contain #cmakedefine which is modified by porfile.cmake of ijg-libjpeg port in VcPkg
|
10 |
+
# By doing this we can skip 'configure' step. Visit https://github.com/LuaDist/libjpeg
|
11 |
+
#
|
12 |
+
include(CheckIncludeFile)
|
13 |
+
check_include_file(stddef.h HAVE_STDDEF_H)
|
14 |
+
check_include_file(stdlib.h HAVE_STDLIB_H)
|
15 |
+
configure_file(jconfig.txt ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h)
|
16 |
+
|
17 |
+
list(APPEND PUBLIC_HEADERS jpeglib.h jerror.h jmorecfg.h ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h)
|
18 |
+
|
19 |
+
add_library(jpeg
|
20 |
+
${PUBLIC_HEADERS} jinclude.h jpegint.h jversion.h
|
21 |
+
transupp.h jidctflt.c jidctfst.c jidctint.c jquant1.c jquant2.c jutils.c jmemnobs.c jaricom.c jerror.c jdatadst.c jdatasrc.c
|
22 |
+
jmemsys.h
|
23 |
+
jmemmgr.c
|
24 |
+
cdjpeg.h cderror.h
|
25 |
+
jcmaster.c jcmarker.c jcmainct.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c jcsample.c jctrans.c jcinit.c jcomapi.c jcparam.c jcprepct.c
|
26 |
+
jdmaster.c jdmarker.c jdmainct.c jdapimin.c jdapistd.c jdarith.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdsample.c jdtrans.c jdinput.c jdmerge.c jdpostct.c
|
27 |
+
jdct.h
|
28 |
+
jfdctflt.c jfdctfst.c jfdctint.c
|
29 |
+
)
|
30 |
+
|
31 |
+
if(WIN32)
|
32 |
+
target_compile_definitions(jpeg
|
33 |
+
PRIVATE
|
34 |
+
_CRT_SECURE_NO_WARNINGS
|
35 |
+
)
|
36 |
+
endif()
|
37 |
+
|
38 |
+
target_include_directories(jpeg PRIVATE include ${CMAKE_CURRENT_BINARY_DIR})
|
39 |
+
|
40 |
+
install(FILES ${PUBLIC_HEADERS}
|
41 |
+
DESTINATION ${CMAKE_INSTALL_PREFIX}/include
|
42 |
+
)
|
43 |
+
install(TARGETS jpeg
|
44 |
+
RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
|
45 |
+
LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
|
46 |
+
ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
|
47 |
+
)
|
48 |
+
|
49 |
+
if(BUILD_EXECUTABLES)
|
50 |
+
add_executable(cjpeg cdjpeg.c cjpeg.c rdbmp.c rdgif.c rdppm.c rdrle.c rdtarga.c rdswitch.c)
|
51 |
+
target_link_libraries(cjpeg PRIVATE jpeg)
|
52 |
+
|
53 |
+
add_executable(djpeg cdjpeg.c djpeg.c wrbmp.c wrgif.c wrppm.c wrrle.c wrtarga.c rdcolmap.c)
|
54 |
+
target_link_libraries(djpeg PRIVATE jpeg)
|
55 |
+
|
56 |
+
add_executable(jpegtran jpegtran.c cdjpeg.c rdswitch.c transupp.c)
|
57 |
+
target_link_libraries(jpegtran PRIVATE jpeg)
|
58 |
+
|
59 |
+
add_executable(rdjpgcom rdjpgcom.c)
|
60 |
+
add_executable(wrjpgcom wrjpgcom.c)
|
61 |
+
|
62 |
+
install(TARGETS cjpeg djpeg jpegtran rdjpgcom wrjpgcom
|
63 |
+
DESTINATION ${CMAKE_INSTALL_PREFIX}/tools
|
64 |
+
)
|
65 |
+
endif()
|
cc-multilingual-main/cc_net/vcpkg/ports/ijg-libjpeg/portfile.cmake
ADDED
@@ -0,0 +1,50 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if(EXISTS ${CURRENT_INSTALLED_DIR}/share/libturbo-jpeg/copyright)
|
2 |
+
message(FATAL_ERROR "'${PORT}' conflicts with 'libturbo-jpeg'. Please remove libturbo-jpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
|
3 |
+
endif()
|
4 |
+
if(EXISTS ${CURRENT_INSTALLED_DIR}/share/mozjpeg/copyright)
|
5 |
+
message(FATAL_ERROR "'${PORT}' conflicts with 'mozjpeg'. Please remove mozjpeg:${TARGET_TRIPLET}, and try to install ${PORT}:${TARGET_TRIPLET} again.")
|
6 |
+
endif()
|
7 |
+
|
8 |
+
if(VCPKG_TARGET_IS_WINDOWS)
|
9 |
+
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
10 |
+
endif()
|
11 |
+
|
12 |
+
vcpkg_download_distfile(ARCHIVE
|
13 |
+
URLS "http://www.ijg.org/files/jpegsr9e.zip"
|
14 |
+
FILENAME "jpegsr9e.zip"
|
15 |
+
SHA512 db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64
|
16 |
+
)
|
17 |
+
vcpkg_extract_source_archive(
|
18 |
+
SOURCE_PATH
|
19 |
+
ARCHIVE ${ARCHIVE}
|
20 |
+
)
|
21 |
+
|
22 |
+
# Replace some #define in jconfig.txt to #cmakedefine so the CMakeLists.txt can run `configure_file` command.
|
23 |
+
# See https://github.com/LuaDist/libjpeg
|
24 |
+
vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt"
|
25 |
+
"#define HAVE_STDDEF_H"
|
26 |
+
"#cmakedefine HAVE_STDDEF_H"
|
27 |
+
)
|
28 |
+
vcpkg_replace_string("${SOURCE_PATH}/jconfig.txt"
|
29 |
+
"#define HAVE_STDLIB_H"
|
30 |
+
"#cmakedefine HAVE_STDLIB_H"
|
31 |
+
)
|
32 |
+
|
33 |
+
file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
|
34 |
+
|
35 |
+
vcpkg_cmake_configure(
|
36 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
37 |
+
OPTIONS
|
38 |
+
-DBUILD_EXECUTABLES=OFF # supports [tools] feature to enable this option?
|
39 |
+
)
|
40 |
+
vcpkg_cmake_install()
|
41 |
+
vcpkg_copy_pdbs()
|
42 |
+
|
43 |
+
# There is no LICENSE file, but README containes some legal text.
|
44 |
+
file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
45 |
+
|
46 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
47 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
48 |
+
endif()
|
49 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
50 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
cc-multilingual-main/cc_net/vcpkg/ports/ijg-libjpeg/vcpkg.json
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "ijg-libjpeg",
|
3 |
+
"version-string": "9e",
|
4 |
+
"port-version": 1,
|
5 |
+
"description": "Independent JPEG Group's JPEG software",
|
6 |
+
"homepage": "http://www.ijg.org/",
|
7 |
+
"license": null,
|
8 |
+
"supports": "!emscripten & !wasm32",
|
9 |
+
"dependencies": [
|
10 |
+
{
|
11 |
+
"name": "vcpkg-cmake",
|
12 |
+
"host": true
|
13 |
+
},
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake-config",
|
16 |
+
"host": true
|
17 |
+
}
|
18 |
+
]
|
19 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/always-generate-pdb.patch
ADDED
@@ -0,0 +1,80 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 19d3b3fca689fb87e819b0b27bc74d1f52fcd2c8 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Billy Robert O'Neal III <[email protected]>
|
3 |
+
Date: Wed, 12 Jan 2022 12:40:30 +0000
|
4 |
+
Subject: [PATCH] lib: generate PDB in release build on Windows
|
5 |
+
|
6 |
+
PDBs are necessary for postmortem debugging and for teams to get reports
|
7 |
+
from Watson, so they should be built for released software too. This
|
8 |
+
change always passes /DEBUG to the MSVC linker. That switch controls
|
9 |
+
whether a PDB is generated (as in "generate debugging information") not
|
10 |
+
a statement that the resulting files are the debug specific version of
|
11 |
+
your library.
|
12 |
+
|
13 |
+
/DEBUG changes the default values of /INCREMENTAL (to on) and /OPT:REF
|
14 |
+
and /OPT:ICF to off, so those are changed back to incremental off and
|
15 |
+
linker optimizations on in debug builds.
|
16 |
+
|
17 |
+
This missing PDB issue was discovered in fixing intel-ipsec's port in
|
18 |
+
vcpkg to build on Windows (https://github.com/microsoft/vcpkg/pull/22269).
|
19 |
+
|
20 |
+
intel-ipsec-mb vcpkg PR link is https://github.com/microsoft/vcpkg/pull/5586
|
21 |
+
---
|
22 |
+
lib/win_x64.mak | 12 +++++++-----
|
23 |
+
1 file changed, 7 insertions(+), 5 deletions(-)
|
24 |
+
|
25 |
+
diff --git a/lib/win_x64.mak b/lib/win_x64.mak
|
26 |
+
index 89162feb..bb62b2ea 100644
|
27 |
+
--- a/lib/win_x64.mak
|
28 |
+
+++ b/lib/win_x64.mak
|
29 |
+
@@ -12,7 +12,7 @@
|
30 |
+
# * Neither the name of Intel Corporation nor the names of its contributors
|
31 |
+
# may be used to endorse or promote products derived from this software
|
32 |
+
# without specific prior written permission.
|
33 |
+
-#
|
34 |
+
+#
|
35 |
+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
36 |
+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
37 |
+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
38 |
+
@@ -71,14 +71,14 @@ LIB_DIR = .\
|
39 |
+
|
40 |
+
!ifdef DEBUG
|
41 |
+
OPT = $(DEBUG_OPT)
|
42 |
+
-DCFLAGS = /DDEBUG /Z7
|
43 |
+
+DCFLAGS = /DDEBUG
|
44 |
+
DAFLAGS = -gcv8
|
45 |
+
-DLFLAGS = /DEBUG
|
46 |
+
+DLFLAGS = /DEBUG /INCREMENTAL:NO
|
47 |
+
!else
|
48 |
+
OPT = /O2 /Oi
|
49 |
+
DCFLAGS =
|
50 |
+
DAFLAGS =
|
51 |
+
-DLFLAGS = /RELEASE
|
52 |
+
+DLFLAGS = /RELEASE /DEBUG /OPT:REF /OPT:ICF /INCREMENTAL:NO
|
53 |
+
!endif
|
54 |
+
|
55 |
+
!if "$(SAFE_DATA)" != "n"
|
56 |
+
@@ -98,7 +98,7 @@ DAFLAGS = $(DAFLAGS) -DSAFE_LOOKUP
|
57 |
+
|
58 |
+
CC = cl
|
59 |
+
CFLAGS_ALL = $(EXTRA_CFLAGS) /DNO_COMPAT_IMB_API_053 /I. /Iinclude /Ino-aesni \
|
60 |
+
- /nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc
|
61 |
+
+ /nologo /Y- /W3 /WX- /Gm- /fp:precise /EHsc /Z7
|
62 |
+
|
63 |
+
CFLAGS = $(CFLAGS_ALL) $(OPT) $(DCFLAGS)
|
64 |
+
CFLAGS_NO_SIMD = $(CFLAGS_ALL) /Od $(DCFLAGS)
|
65 |
+
@@ -633,6 +633,7 @@ install:
|
66 |
+
-copy /Y /V /B $(LIBBASE).lib "$(INSTDIR)"
|
67 |
+
-copy /Y /V /A intel-ipsec-mb.h "$(INSTDIR)"
|
68 |
+
!if "$(SHARED)" == "y"
|
69 |
+
+ -copy /Y /V /B $(LIB_DIR)\$(LIBBASE).pdb "$(INSTDIR)"
|
70 |
+
-copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "$(INSTDIR)"
|
71 |
+
-copy /Y /V /B $(LIB_DIR)\$(LIBBASE).dll "%windir%\system32"
|
72 |
+
!endif
|
73 |
+
@@ -641,6 +642,7 @@ uninstall:
|
74 |
+
!if "$(SHARED)" == "y"
|
75 |
+
-del /Q "%windir%\system32\$(LIBBASE).dll"
|
76 |
+
-del /Q "$(INSTDIR)\$(LIBBASE).dll"
|
77 |
+
+ -del /Q "$(INSTDIR)\$(LIBBASE).pdb"
|
78 |
+
!endif
|
79 |
+
-del /Q "$(INSTDIR)\$(LIBBASE).def"
|
80 |
+
-del /Q "$(INSTDIR)\$(LIBBASE).exp"
|
cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/intel-ipsec-targets-implib.cmake.in
ADDED
@@ -0,0 +1,5 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@)
|
2 |
+
set_target_properties(IPSEC::ipsec PROPERTIES
|
3 |
+
IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@"
|
4 |
+
IMPORTED_IMPLIB_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_IMPLIB@"
|
5 |
+
)
|
cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/intel-ipsec-targets.cmake.in
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
set_property(TARGET IPSEC::ipsec APPEND PROPERTY IMPORTED_CONFIGURATIONS @INTEL_IPSEC_CONFIGURATION@)
|
2 |
+
set_target_properties(IPSEC::ipsec PROPERTIES
|
3 |
+
IMPORTED_LOCATION_@INTEL_IPSEC_CONFIGURATION@ "${_IMPORT_PREFIX}/@INTEL_IPSEC_LOCATION@"
|
4 |
+
)
|
cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/intel-ipsecConfig.cmake.in
ADDED
@@ -0,0 +1,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
if(TARGET IPSEC::ipsec)
|
2 |
+
return()
|
3 |
+
endif()
|
4 |
+
|
5 |
+
get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) # intel-ipsec
|
6 |
+
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # share
|
7 |
+
get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) # package root
|
8 |
+
add_library(IPSEC::ipsec @INTEL_IPSEC_STATIC_OR_SHARED@ IMPORTED)
|
9 |
+
set_target_properties(IPSEC::ipsec PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include")
|
10 |
+
set(IPSEC_ipsec_FOUND 1)
|
11 |
+
|
12 |
+
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
13 |
+
file(GLOB CONFIG_FILES "${_DIR}/intel-ipsec-targets-*.cmake")
|
14 |
+
foreach(f ${CONFIG_FILES})
|
15 |
+
include(${f})
|
16 |
+
endforeach()
|
cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/portfile.cmake
ADDED
@@ -0,0 +1,105 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO intel/intel-ipsec-mb
|
4 |
+
REF bde82c8737edc04d80549f0a68225ede7e5cefd #v1.1
|
5 |
+
SHA512 f41dcde88b062e8ec2327987c6d36cd4f74a5e4fea386cc1ef8364f1dc432a2db02ca7d3312c0471b443cf93e815af6d74a4819c249afd6777aa91693b2546e5
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
always-generate-pdb.patch # https://github.com/intel/intel-ipsec-mb/pull/93
|
9 |
+
)
|
10 |
+
|
11 |
+
vcpkg_find_acquire_program(NASM)
|
12 |
+
get_filename_component(NASM_DIR "${NASM}" DIRECTORY)
|
13 |
+
vcpkg_add_to_path(PREPEND "${NASM_DIR}")
|
14 |
+
|
15 |
+
vcpkg_list(SET MAKE_OPTIONS)
|
16 |
+
set(INTEL_IPSEC_STATIC_OR_SHARED SHARED)
|
17 |
+
if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
|
18 |
+
vcpkg_list(APPEND MAKE_OPTIONS SHARED=n)
|
19 |
+
set(INTEL_IPSEC_STATIC_OR_SHARED STATIC)
|
20 |
+
endif()
|
21 |
+
|
22 |
+
set(DEBUG_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib")
|
23 |
+
set(RELEASE_LIB "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib")
|
24 |
+
|
25 |
+
if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
|
26 |
+
vcpkg_build_nmake(
|
27 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
28 |
+
PROJECT_SUBPATH lib
|
29 |
+
PROJECT_NAME win_x64.mak
|
30 |
+
OPTIONS ${MAKE_OPTIONS}
|
31 |
+
OPTIONS_DEBUG DEBUG=y
|
32 |
+
)
|
33 |
+
|
34 |
+
if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release")
|
35 |
+
file(INSTALL "${DEBUG_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
36 |
+
set(INTEL_IPSEC_CONFIGURATION "DEBUG")
|
37 |
+
if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
|
38 |
+
set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB.lib")
|
39 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY)
|
40 |
+
else()
|
41 |
+
file(INSTALL "${DEBUG_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
|
42 |
+
file(INSTALL "${DEBUG_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
|
43 |
+
file(INSTALL "${DEBUG_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
44 |
+
set(INTEL_IPSEC_LOCATION "debug/bin/libIPSec_MB.dll")
|
45 |
+
set(INTEL_IPSEC_IMPLIB "debug/lib/libIPSec_MB.lib")
|
46 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY)
|
47 |
+
endif()
|
48 |
+
endif()
|
49 |
+
|
50 |
+
file(INSTALL "${RELEASE_LIB}/libIPSec_MB.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
51 |
+
set(INTEL_IPSEC_CONFIGURATION "RELEASE")
|
52 |
+
if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
|
53 |
+
set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB.lib")
|
54 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY)
|
55 |
+
else()
|
56 |
+
file(INSTALL "${RELEASE_LIB}/libIPSec_MB.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
|
57 |
+
file(INSTALL "${RELEASE_LIB}/libIPSec_MB.pdb" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
|
58 |
+
file(INSTALL "${RELEASE_LIB}/libIPSec_MB.exp" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
59 |
+
set(INTEL_IPSEC_LOCATION "bin/libIPSec_MB.dll")
|
60 |
+
set(INTEL_IPSEC_IMPLIB "lib/libIPSec_MB.lib")
|
61 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets-implib.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY)
|
62 |
+
endif()
|
63 |
+
else()
|
64 |
+
if ("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
|
65 |
+
set(LIB_SUFFIX ".a")
|
66 |
+
else()
|
67 |
+
set(LIB_SUFFIX ".so")
|
68 |
+
endif()
|
69 |
+
|
70 |
+
find_program(MAKE make REQUIRED)
|
71 |
+
if(NOT "${VCPKG_BUILD_TYPE}" STREQUAL "release")
|
72 |
+
message(STATUS "Building ${TARGET_TRIPLET}-dbg")
|
73 |
+
set(INTEL_IPSEC_CONFIGURATION "DEBUG")
|
74 |
+
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
75 |
+
file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
|
76 |
+
vcpkg_execute_build_process(
|
77 |
+
COMMAND "${MAKE}" "-j${VCPKG_CONCURRENCY}" ${MAKE_OPTIONS}
|
78 |
+
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/lib"
|
79 |
+
LOGNAME "build-${TARGET_TRIPLET}-dbg"
|
80 |
+
)
|
81 |
+
|
82 |
+
file(INSTALL "${DEBUG_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
|
83 |
+
set(INTEL_IPSEC_LOCATION "debug/lib/libIPSec_MB${LIB_SUFFIX}")
|
84 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-debug.cmake" @ONLY)
|
85 |
+
endif()
|
86 |
+
|
87 |
+
message(STATUS "Building ${TARGET_TRIPLET}-rel")
|
88 |
+
set(INTEL_IPSEC_CONFIGURATION "RELEASE")
|
89 |
+
file(REMOVE_RECURSE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
90 |
+
file(COPY "${SOURCE_PATH}/" DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
|
91 |
+
vcpkg_execute_build_process(
|
92 |
+
COMMAND "${MAKE}" -j ${MAKE_OPTIONS}
|
93 |
+
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/lib"
|
94 |
+
LOGNAME "build-${TARGET_TRIPLET}-rel"
|
95 |
+
)
|
96 |
+
|
97 |
+
file(INSTALL "${RELEASE_LIB}/libIPSec_MB${LIB_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
|
98 |
+
set(INTEL_IPSEC_LOCATION "lib/libIPSec_MB${LIB_SUFFIX}")
|
99 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsec-targets.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsec-targets-release.cmake" @ONLY)
|
100 |
+
endif()
|
101 |
+
|
102 |
+
file(INSTALL "${SOURCE_PATH}/lib/intel-ipsec-mb.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
|
103 |
+
configure_file("${CMAKE_CURRENT_LIST_DIR}/intel-ipsecConfig.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/intel-ipsecConfig.cmake" @ONLY)
|
104 |
+
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
|
105 |
+
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/usage
ADDED
@@ -0,0 +1,4 @@
|
|
|
|
|
|
|
|
|
|
|
1 |
+
The package intel-ipsec is compatible with built-in CMake targets:
|
2 |
+
|
3 |
+
FIND_PACKAGE(intel-ipsec CONFIG REQUIRED)
|
4 |
+
TARGET_LINK_LIBRARIES(main PRIVATE IPSEC::ipsec)
|
cc-multilingual-main/cc_net/vcpkg/ports/intel-ipsec/vcpkg.json
ADDED
@@ -0,0 +1,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "intel-ipsec",
|
3 |
+
"version": "1.1",
|
4 |
+
"description": "Intel(R) Multi-Buffer Crypto for IPsec Library",
|
5 |
+
"supports": "x64 & (windows | linux) & !uwp"
|
6 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/lcm/disable-docs.patch
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2 |
+
index 6d3a4c2..90833e3 100644
|
3 |
+
--- a/CMakeLists.txt
|
4 |
+
+++ b/CMakeLists.txt
|
5 |
+
@@ -39,7 +39,6 @@ if(LCM_ENABLE_EXAMPLES)
|
6 |
+
endif()
|
7 |
+
|
8 |
+
# Documentation (Main, C/C++, .NET)
|
9 |
+
-add_subdirectory(docs)
|
10 |
+
|
11 |
+
# Java
|
12 |
+
lcm_option(
|
cc-multilingual-main/cc_net/vcpkg/ports/lcm/fix-build-error.patch
ADDED
@@ -0,0 +1,32 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/lcm/windows/WinPorting.cpp b/lcm/windows/WinPorting.cpp
|
2 |
+
index e22acd6..b9c7e69 100644
|
3 |
+
--- a/lcm/windows/WinPorting.cpp
|
4 |
+
+++ b/lcm/windows/WinPorting.cpp
|
5 |
+
@@ -1,8 +1,8 @@
|
6 |
+
|
7 |
+
#define _WIN32_WINNT 0x0501
|
8 |
+
-#include <Mswsock.h>
|
9 |
+
#include <stdio.h>
|
10 |
+
#include <winsock2.h>
|
11 |
+
+#include <Mswsock.h>
|
12 |
+
|
13 |
+
#include "WinPorting.h"
|
14 |
+
|
15 |
+
diff --git a/lcmgen/emit_go.c b/lcmgen/emit_go.c
|
16 |
+
index c520044..b5be56a 100644
|
17 |
+
--- a/lcmgen/emit_go.c
|
18 |
+
+++ b/lcmgen/emit_go.c
|
19 |
+
@@ -6,8 +6,13 @@
|
20 |
+
#include <stdio.h>
|
21 |
+
#include <stdlib.h>
|
22 |
+
#include <string.h>
|
23 |
+
+#ifdef WIN32
|
24 |
+
+#include <io.h>
|
25 |
+
+#else
|
26 |
+
#include <unistd.h>
|
27 |
+
+#endif
|
28 |
+
#ifdef WIN32
|
29 |
+
+#define F_OK 0
|
30 |
+
#define __STDC_FORMAT_MACROS // Enable integer types
|
31 |
+
#endif
|
32 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/lcm/glib.link.patch
ADDED
@@ -0,0 +1,30 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/cmake/FindGLib2.cmake b/cmake/FindGLib2.cmake
|
2 |
+
index 2f1a8be45..db823b953 100644
|
3 |
+
--- a/cmake/FindGLib2.cmake
|
4 |
+
+++ b/cmake/FindGLib2.cmake
|
5 |
+
@@ -14,7 +14,7 @@ function(_glib2_find_include VAR HEADER)
|
6 |
+
|
7 |
+
find_path(GLIB2_${VAR}_INCLUDE_DIR ${HEADER}
|
8 |
+
PATHS ${_paths}
|
9 |
+
- PATH_SUFFIXES glib-2.0 glib-2.0/include
|
10 |
+
+ PATH_SUFFIXES glib-2.0 glib-2.0/include lib/glib-2.0/include
|
11 |
+
)
|
12 |
+
mark_as_advanced(GLIB2_${VAR}_INCLUDE_DIR)
|
13 |
+
endfunction()
|
14 |
+
@@ -108,6 +108,16 @@ foreach(_glib2_component ${GLib2_FIND_COMPONENTS})
|
15 |
+
|
16 |
+
endforeach()
|
17 |
+
|
18 |
+
+find_library(PCRE_LIBRARY pcre2-8)
|
19 |
+
+set_property(TARGET GLib2::glib APPEND PROPERTY
|
20 |
+
+ INTERFACE_LINK_LIBRARIES ${PCRE_LIBRARY}
|
21 |
+
+)
|
22 |
+
+set(THREADS_PREFER_PTHREAD_FLAG ON)
|
23 |
+
+find_package(Threads)
|
24 |
+
+set_property(TARGET GLib2::glib APPEND PROPERTY
|
25 |
+
+ INTERFACE_LINK_LIBRARIES Threads::Threads
|
26 |
+
+)
|
27 |
+
+
|
28 |
+
list(APPEND GLib2_FIND_COMPONENTS glib)
|
29 |
+
set(GLib2_FIND_REQUIRED_glib TRUE)
|
30 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/lcm/only-install-one-flavor.patch
ADDED
@@ -0,0 +1,19 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
diff --git a/lcm/CMakeLists.txt b/lcm/CMakeLists.txt
|
2 |
+
index a706a85..639ec12 100644
|
3 |
+
--- a/lcm/CMakeLists.txt
|
4 |
+
+++ b/lcm/CMakeLists.txt
|
5 |
+
@@ -76,8 +76,12 @@ endif()
|
6 |
+
target_include_directories(lcm-coretypes INTERFACE
|
7 |
+
$<BUILD_INTERFACE:${lcm_SOURCE_DIR}>
|
8 |
+
)
|
9 |
+
-
|
10 |
+
-install(TARGETS lcm-coretypes lcm-static lcm
|
11 |
+
+if(BUILD_SHARED_LIBS)
|
12 |
+
+ set(INSTALL_TARGETS lcm)
|
13 |
+
+else()
|
14 |
+
+ set(INSTALL_TARGETS lcm-static)
|
15 |
+
+endif()
|
16 |
+
+install(TARGETS lcm-coretypes ${INSTALL_TARGETS}
|
17 |
+
EXPORT lcmTargets
|
18 |
+
RUNTIME DESTINATION bin
|
19 |
+
LIBRARY DESTINATION lib${LIB_SUFFIX}
|
cc-multilingual-main/cc_net/vcpkg/ports/lcm/portfile.cmake
ADDED
@@ -0,0 +1,47 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
vcpkg_from_github(
|
2 |
+
OUT_SOURCE_PATH SOURCE_PATH
|
3 |
+
REPO lcm-proj/lcm
|
4 |
+
REF v1.4.0
|
5 |
+
SHA512 ca036aa2c31911e0bfaeab9665188c97726201267314693a1c333c4efe13ea598b39a55a19bc1d48e65462ac9d1716adfda5af86c645d59c3247192631247cc6
|
6 |
+
HEAD_REF master
|
7 |
+
PATCHES
|
8 |
+
only-install-one-flavor.patch
|
9 |
+
fix-build-error.patch
|
10 |
+
glib.link.patch
|
11 |
+
disable-docs.patch
|
12 |
+
)
|
13 |
+
|
14 |
+
vcpkg_cmake_configure(
|
15 |
+
SOURCE_PATH "${SOURCE_PATH}"
|
16 |
+
OPTIONS
|
17 |
+
-DLCM_ENABLE_JAVA=OFF
|
18 |
+
-DLCM_ENABLE_LUA=OFF
|
19 |
+
-DLCM_ENABLE_PYTHON=OFF
|
20 |
+
-DLCM_ENABLE_GO=OFF
|
21 |
+
-DLCM_ENABLE_TESTS=OFF
|
22 |
+
-DLCM_ENABLE_EXAMPLES=OFF
|
23 |
+
-DLCM_INSTALL_M4MACROS=OFF
|
24 |
+
-DLCM_INSTALL_PKGCONFIG=OFF
|
25 |
+
)
|
26 |
+
|
27 |
+
vcpkg_cmake_install()
|
28 |
+
if (VCPKG_TARGET_IS_WINDOWS)
|
29 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
|
30 |
+
else()
|
31 |
+
vcpkg_cmake_config_fixup(CONFIG_PATH lib/lcm/cmake)
|
32 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/lcm" "${CURRENT_PACKAGES_DIR}/lib/lcm")
|
33 |
+
endif()
|
34 |
+
|
35 |
+
vcpkg_copy_pdbs()
|
36 |
+
|
37 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
38 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
39 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man")
|
40 |
+
|
41 |
+
vcpkg_copy_tools(TOOL_NAMES lcm-gen lcm-logger lcm-logplayer AUTO_CLEAN)
|
42 |
+
|
43 |
+
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
|
44 |
+
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
|
45 |
+
endif()
|
46 |
+
|
47 |
+
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
cc-multilingual-main/cc_net/vcpkg/ports/lcm/vcpkg.json
ADDED
@@ -0,0 +1,23 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
{
|
2 |
+
"name": "lcm",
|
3 |
+
"version": "1.4.0",
|
4 |
+
"port-version": 6,
|
5 |
+
"description": [
|
6 |
+
"Lightweight Communications and Marshalling (LCM)",
|
7 |
+
"LCM is a set of libraries and tools for message passing and data marshalling, targeted at real-time systems where high-bandwidth and low latency are critical. It provides a publish/subscribe message passing model and automatic marshalling/unmarshalling code generation with bindings for applications in a variety of programming languages."
|
8 |
+
],
|
9 |
+
"homepage": "https://github.com/lcm-proj/lcm",
|
10 |
+
"license": "LGPL-2.1-or-later",
|
11 |
+
"supports": "!osx & !xbox",
|
12 |
+
"dependencies": [
|
13 |
+
"glib",
|
14 |
+
{
|
15 |
+
"name": "vcpkg-cmake",
|
16 |
+
"host": true
|
17 |
+
},
|
18 |
+
{
|
19 |
+
"name": "vcpkg-cmake-config",
|
20 |
+
"host": true
|
21 |
+
}
|
22 |
+
]
|
23 |
+
}
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0001-Use-libtre.patch
ADDED
@@ -0,0 +1,53 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From e6e59f41c082be94c4fef007e276b1dffe7dc240 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sat, 8 May 2021 19:28:01 +0700
|
4 |
+
Subject: [PATCH 01/14] Use libtre
|
5 |
+
|
6 |
+
---
|
7 |
+
configure.ac | 2 +-
|
8 |
+
src/Makefile.am | 2 +-
|
9 |
+
src/file.h | 2 +-
|
10 |
+
3 files changed, 3 insertions(+), 3 deletions(-)
|
11 |
+
|
12 |
+
diff --git a/configure.ac b/configure.ac
|
13 |
+
index 02eac8f..b05c334 100644
|
14 |
+
--- a/configure.ac
|
15 |
+
+++ b/configure.ac
|
16 |
+
@@ -185,7 +185,7 @@ if test "$enable_libseccomp" != "no"; then
|
17 |
+
AC_CHECK_LIB(seccomp, seccomp_init)
|
18 |
+
fi
|
19 |
+
if test "$MINGW" = 1; then
|
20 |
+
- AC_CHECK_LIB(gnurx,regexec,,AC_MSG_ERROR([libgnurx is required to build file(1) with MinGW]))
|
21 |
+
+ AC_SEARCH_LIBS(tre_regexec,tre,,AC_MSG_ERROR([libtre is required to build file(1) with MinGW]))
|
22 |
+
fi
|
23 |
+
|
24 |
+
dnl See if we are cross-compiling
|
25 |
+
diff --git a/src/Makefile.am b/src/Makefile.am
|
26 |
+
index 3f67f2c..34781b9 100644
|
27 |
+
--- a/src/Makefile.am
|
28 |
+
+++ b/src/Makefile.am
|
29 |
+
@@ -13,7 +13,7 @@ libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
|
30 |
+
file_opts.h elfclass.h mygetopt.h cdf.c cdf_time.c readcdf.c cdf.h
|
31 |
+
libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0
|
32 |
+
if MINGW
|
33 |
+
-MINGWLIBS = -lgnurx -lshlwapi
|
34 |
+
+MINGWLIBS = -lshlwapi
|
35 |
+
else
|
36 |
+
MINGWLIBS =
|
37 |
+
endif
|
38 |
+
diff --git a/src/file.h b/src/file.h
|
39 |
+
index c548e97..299ac0c 100644
|
40 |
+
--- a/src/file.h
|
41 |
+
+++ b/src/file.h
|
42 |
+
@@ -79,7 +79,7 @@
|
43 |
+
#include <stdio.h> /* Include that here, to make sure __P gets defined */
|
44 |
+
#include <errno.h>
|
45 |
+
#include <fcntl.h> /* For open and flags */
|
46 |
+
-#include <regex.h>
|
47 |
+
+#include <tre/regex.h>
|
48 |
+
#include <time.h>
|
49 |
+
#include <sys/types.h>
|
50 |
+
#ifndef WIN32
|
51 |
+
--
|
52 |
+
2.29.2.windows.2
|
53 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0002-Change-zlib-lib-name-to-match-CMake-output.patch
ADDED
@@ -0,0 +1,39 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 2fa43ece9ec7564e1fbb9867bb5852b834643aa4 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sat, 8 May 2021 19:36:11 +0700
|
4 |
+
Subject: [PATCH 02/14] Change zlib lib name to match CMake output
|
5 |
+
|
6 |
+
---
|
7 |
+
configure.ac | 6 +++---
|
8 |
+
1 file changed, 3 insertions(+), 3 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/configure.ac b/configure.ac
|
11 |
+
index b05c334..dd4063c 100644
|
12 |
+
--- a/configure.ac
|
13 |
+
+++ b/configure.ac
|
14 |
+
@@ -173,7 +173,7 @@ AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r
|
15 |
+
|
16 |
+
dnl Checks for libraries
|
17 |
+
if test "$enable_zlib" != "no"; then
|
18 |
+
- AC_CHECK_LIB(z, gzopen)
|
19 |
+
+ AC_SEARCH_LIBS(gzopen, [z zlib zlibd], have_zlib="yes", have_zlib="no")
|
20 |
+
fi
|
21 |
+
if test "$enable_bzlib" != "no"; then
|
22 |
+
AC_CHECK_LIB(bz2, BZ2_bzCompressInit)
|
23 |
+
@@ -193,11 +193,11 @@ AM_CONDITIONAL(IS_CROSS_COMPILE, test "$cross_compiling" = yes)
|
24 |
+
|
25 |
+
dnl Final sanity checks
|
26 |
+
if test "$enable_zlib" = "yes"; then
|
27 |
+
- if test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" != "yesyes"; then
|
28 |
+
+ if test "$ac_cv_header_zlib_h$have_zlib" != "yesyes"; then
|
29 |
+
AC_MSG_ERROR([zlib support requested but not found])
|
30 |
+
fi
|
31 |
+
fi
|
32 |
+
-if test "$ac_cv_header_zlib_h$ac_cv_lib_z_gzopen" = "yesyes"; then
|
33 |
+
+if test "$ac_cv_header_zlib_h$have_zlib" = "yesyes"; then
|
34 |
+
AC_DEFINE([ZLIBSUPPORT], 1, [Enable zlib compression support])
|
35 |
+
fi
|
36 |
+
if test "$enable_bzlib" = "yes"; then
|
37 |
+
--
|
38 |
+
2.29.2.windows.2
|
39 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0003-Fix-WIN32-macro-checks.patch
ADDED
@@ -0,0 +1,43 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 2fffeb273ea46c1e91536f3d660982de785c8d49 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sat, 8 May 2021 20:52:59 +0700
|
4 |
+
Subject: [PATCH 03/14] Fix WIN32 macro checks
|
5 |
+
|
6 |
+
---
|
7 |
+
src/file.h | 6 +++---
|
8 |
+
1 file changed, 3 insertions(+), 3 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/src/file.h b/src/file.h
|
11 |
+
index 299ac0c..2c365a6 100644
|
12 |
+
--- a/src/file.h
|
13 |
+
+++ b/src/file.h
|
14 |
+
@@ -82,7 +82,7 @@
|
15 |
+
#include <tre/regex.h>
|
16 |
+
#include <time.h>
|
17 |
+
#include <sys/types.h>
|
18 |
+
-#ifndef WIN32
|
19 |
+
+#ifndef _WIN32
|
20 |
+
#include <sys/param.h>
|
21 |
+
#endif
|
22 |
+
/* Do this here and now, because struct stat gets re-defined on solaris */
|
23 |
+
@@ -95,7 +95,7 @@
|
24 |
+
#define MAGIC "/etc/magic"
|
25 |
+
#endif
|
26 |
+
|
27 |
+
-#if defined(__EMX__) || defined (WIN32)
|
28 |
+
+#if defined(__EMX__) || defined (_WIN32)
|
29 |
+
#define PATHSEP ';'
|
30 |
+
#else
|
31 |
+
#define PATHSEP ':'
|
32 |
+
@@ -103,7 +103,7 @@
|
33 |
+
|
34 |
+
#define file_private static
|
35 |
+
|
36 |
+
-#if HAVE_VISIBILITY && !defined(WIN32)
|
37 |
+
+#if HAVE_VISIBILITY && !defined(_WIN32)
|
38 |
+
#define file_public __attribute__ ((__visibility__("default")))
|
39 |
+
#ifndef file_protected
|
40 |
+
#define file_protected __attribute__ ((__visibility__("hidden")))
|
41 |
+
--
|
42 |
+
2.29.2.windows.2
|
43 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0004-Typedef-POSIX-types-on-Windows.patch
ADDED
@@ -0,0 +1,29 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From eb3dde2954dacd86ec7490540eb9b7e3530b917b Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sat, 8 May 2021 20:12:55 +0700
|
4 |
+
Subject: [PATCH 04/14] Typedef POSIX types on Windows
|
5 |
+
|
6 |
+
---
|
7 |
+
src/file.h | 6 ++++++
|
8 |
+
1 file changed, 6 insertions(+)
|
9 |
+
|
10 |
+
diff --git a/src/file.h b/src/file.h
|
11 |
+
index 2c365a6..0332506 100644
|
12 |
+
--- a/src/file.h
|
13 |
+
+++ b/src/file.h
|
14 |
+
@@ -425,6 +425,12 @@ struct cont {
|
15 |
+
|
16 |
+
#define MAGIC_SETS 2
|
17 |
+
|
18 |
+
+#ifdef _MSC_VER
|
19 |
+
+#include <BaseTsd.h>
|
20 |
+
+typedef int mode_t;
|
21 |
+
+typedef SSIZE_T ssize_t;
|
22 |
+
+#endif
|
23 |
+
+
|
24 |
+
struct magic_set {
|
25 |
+
struct mlist *mlist[MAGIC_SETS]; /* list of regular entries */
|
26 |
+
struct cont c;
|
27 |
+
--
|
28 |
+
2.29.2.windows.2
|
29 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0005-Include-dirent.h-for-S_ISREG-and-S_ISDIR.patch
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From a8f8fbfc2736419c65992cbf24de963c3b1f3107 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sat, 8 May 2021 22:07:55 +0700
|
4 |
+
Subject: [PATCH 05/14] Include dirent.h for S_ISREG and S_ISDIR
|
5 |
+
|
6 |
+
---
|
7 |
+
src/file.h | 1 +
|
8 |
+
1 file changed, 1 insertion(+)
|
9 |
+
|
10 |
+
diff --git a/src/file.h b/src/file.h
|
11 |
+
index 0332506..4aa9f60 100644
|
12 |
+
--- a/src/file.h
|
13 |
+
+++ b/src/file.h
|
14 |
+
@@ -88,7 +88,8 @@
|
15 |
+
/* Do this here and now, because struct stat gets re-defined on solaris */
|
16 |
+
#include <sys/stat.h>
|
17 |
+
#include <stdarg.h>
|
18 |
+
+#include <dirent.h>
|
19 |
+
#include <locale.h>
|
20 |
+
#if defined(HAVE_XLOCALE_H)
|
21 |
+
#include <xlocale.h>
|
22 |
+
#endif
|
23 |
+
--
|
24 |
+
2.29.2.windows.2
|
25 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0006-Remove-Wrap-POSIX-headers.patch
ADDED
@@ -0,0 +1,189 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From b20c8e62851f3cb53083a3e7811518092f98dc26 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sat, 8 May 2021 22:47:32 +0700
|
4 |
+
Subject: [PATCH 06/14] Remove/Wrap POSIX headers
|
5 |
+
|
6 |
+
---
|
7 |
+
src/buffer.c | 2 ++
|
8 |
+
src/cdf.c | 2 ++
|
9 |
+
src/dprintf.c | 2 ++
|
10 |
+
src/file.c | 1 -
|
11 |
+
src/getline.c | 2 ++
|
12 |
+
src/is_csv.c | 2 ++
|
13 |
+
src/is_json.c | 2 ++
|
14 |
+
src/magic.c | 2 ++
|
15 |
+
src/memtest.c | 2 ++
|
16 |
+
src/mygetopt.h | 2 ++
|
17 |
+
src/pread.c | 2 ++
|
18 |
+
src/readcdf.c | 2 ++
|
19 |
+
12 files changed, 22 insertions(+), 1 deletion(-)
|
20 |
+
|
21 |
+
diff --git a/src/buffer.c b/src/buffer.c
|
22 |
+
index 227015a..f3d8efa 100644
|
23 |
+
--- a/src/buffer.c
|
24 |
+
+++ b/src/buffer.c
|
25 |
+
@@ -31,7 +31,9 @@ FILE_RCSID("@(#)$File: buffer.c,v 1.8 2020/02/16 15:52:49 christos Exp $")
|
26 |
+
#endif /* lint */
|
27 |
+
|
28 |
+
#include "magic.h"
|
29 |
+
+#ifdef HAVE_UNISTD_H
|
30 |
+
#include <unistd.h>
|
31 |
+
+#endif
|
32 |
+
#include <string.h>
|
33 |
+
#include <stdlib.h>
|
34 |
+
#include <sys/stat.h>
|
35 |
+
diff --git a/src/cdf.c b/src/cdf.c
|
36 |
+
index bb81d63..dc9ec56 100644
|
37 |
+
--- a/src/cdf.c
|
38 |
+
+++ b/src/cdf.c
|
39 |
+
@@ -43,7 +43,9 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.116 2019/08/26 14:31:39 christos Exp $")
|
40 |
+
#include <err.h>
|
41 |
+
#endif
|
42 |
+
#include <stdlib.h>
|
43 |
+
+#ifdef HAVE_UNISTD_H
|
44 |
+
#include <unistd.h>
|
45 |
+
+#endif
|
46 |
+
#include <string.h>
|
47 |
+
#include <time.h>
|
48 |
+
#include <ctype.h>
|
49 |
+
diff --git a/src/dprintf.c b/src/dprintf.c
|
50 |
+
index 027a64f..873c547 100644
|
51 |
+
--- a/src/dprintf.c
|
52 |
+
+++ b/src/dprintf.c
|
53 |
+
@@ -32,7 +32,9 @@ FILE_RCSID("@(#)$File: dprintf.c,v 1.2 2018/09/09 20:33:28 christos Exp $")
|
54 |
+
#endif /* lint */
|
55 |
+
|
56 |
+
#include <assert.h>
|
57 |
+
+#ifdef HAVE_UNISTD_H
|
58 |
+
#include <unistd.h>
|
59 |
+
+#endif
|
60 |
+
#include <stdio.h>
|
61 |
+
#include <stdarg.h>
|
62 |
+
|
63 |
+
diff --git a/src/file.c b/src/file.c
|
64 |
+
index 87b9ab1..2889f8a 100644
|
65 |
+
--- a/src/file.c
|
66 |
+
+++ b/src/file.c
|
67 |
+
@@ -38,7 +38,6 @@ FILE_RCSID("@(#)$File: file.c,v 1.189 2021/02/05 21:33:49 christos Exp $")
|
68 |
+
#include "magic.h"
|
69 |
+
|
70 |
+
#include <stdlib.h>
|
71 |
+
-#include <unistd.h>
|
72 |
+
#include <string.h>
|
73 |
+
#ifdef RESTORE_TIME
|
74 |
+
# if (__COHERENT__ >= 0x420)
|
75 |
+
diff --git a/src/getline.c b/src/getline.c
|
76 |
+
index b00de01..c2d41ca 100644
|
77 |
+
--- a/src/getline.c
|
78 |
+
+++ b/src/getline.c
|
79 |
+
@@ -33,7 +33,9 @@
|
80 |
+
#if !HAVE_GETLINE
|
81 |
+
#include <stdlib.h>
|
82 |
+
#include <stdio.h>
|
83 |
+
+#ifdef HAVE_UNISTD_H
|
84 |
+
#include <unistd.h>
|
85 |
+
+#endif
|
86 |
+
#include <errno.h>
|
87 |
+
#include <string.h>
|
88 |
+
|
89 |
+
diff --git a/src/is_csv.c b/src/is_csv.c
|
90 |
+
index 937ab5f..2f704c5 100644
|
91 |
+
--- a/src/is_csv.c
|
92 |
+
+++ b/src/is_csv.c
|
93 |
+
@@ -166,7 +166,9 @@ file_is_csv(struct magic_set *ms, const struct buffer *b, int looks_text)
|
94 |
+
#include <sys/stat.h>
|
95 |
+
#include <stdio.h>
|
96 |
+
#include <fcntl.h>
|
97 |
+
+#ifdef HAVE_UNISTD_H
|
98 |
+
#include <unistd.h>
|
99 |
+
+#endif
|
100 |
+
#include <stdlib.h>
|
101 |
+
#include <stdint.h>
|
102 |
+
#include <err.h>
|
103 |
+
diff --git a/src/is_json.c b/src/is_json.c
|
104 |
+
index 0b12438..997a276 100644
|
105 |
+
--- a/src/is_json.c
|
106 |
+
+++ b/src/is_json.c
|
107 |
+
@@ -436,7 +436,9 @@ file_is_json(struct magic_set *ms, const struct buffer *b)
|
108 |
+
#include <sys/stat.h>
|
109 |
+
#include <stdio.h>
|
110 |
+
#include <fcntl.h>
|
111 |
+
+#ifdef HAVE_UNISTD_H
|
112 |
+
#include <unistd.h>
|
113 |
+
+#endif
|
114 |
+
#include <stdlib.h>
|
115 |
+
#include <stdint.h>
|
116 |
+
#include <err.h>
|
117 |
+
diff --git a/src/magic.c b/src/magic.c
|
118 |
+
index 81a0840..e9aeafa 100644
|
119 |
+
--- a/src/magic.c
|
120 |
+
+++ b/src/magic.c
|
121 |
+
@@ -39,7 +39,9 @@ FILE_RCSID("@(#)$File: magic.c,v 1.114 2021/02/05 21:33:49 christos Exp $")
|
122 |
+
#include "magic.h"
|
123 |
+
|
124 |
+
#include <stdlib.h>
|
125 |
+
+#ifdef HAVE_UNISTD_H
|
126 |
+
#include <unistd.h>
|
127 |
+
+#endif
|
128 |
+
#include <string.h>
|
129 |
+
#ifdef QUICK
|
130 |
+
#include <sys/mman.h>
|
131 |
+
diff --git a/src/memtest.c b/src/memtest.c
|
132 |
+
index f9506f6..ea50242 100644
|
133 |
+
--- a/src/memtest.c
|
134 |
+
+++ b/src/memtest.c
|
135 |
+
@@ -34,7 +34,9 @@
|
136 |
+
#include <stdlib.h>
|
137 |
+
#include <err.h>
|
138 |
+
#include <fcntl.h>
|
139 |
+
+#ifdef HAVE_UNISTD_H
|
140 |
+
#include <unistd.h>
|
141 |
+
+#endif
|
142 |
+
#include <dlfcn.h>
|
143 |
+
#include <magic.h>
|
144 |
+
|
145 |
+
diff --git a/src/mygetopt.h b/src/mygetopt.h
|
146 |
+
index d766762..b8e044c 100644
|
147 |
+
--- a/src/mygetopt.h
|
148 |
+
+++ b/src/mygetopt.h
|
149 |
+
@@ -39,7 +39,9 @@
|
150 |
+
#ifndef _GETOPT_H_
|
151 |
+
#define _GETOPT_H_
|
152 |
+
|
153 |
+
+#ifdef HAVE_UNISTD_H
|
154 |
+
#include <unistd.h>
|
155 |
+
+#endif
|
156 |
+
|
157 |
+
/*
|
158 |
+
* Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions
|
159 |
+
diff --git a/src/pread.c b/src/pread.c
|
160 |
+
index 3ab52d1..fc48d84 100644
|
161 |
+
--- a/src/pread.c
|
162 |
+
+++ b/src/pread.c
|
163 |
+
@@ -3,7 +3,9 @@
|
164 |
+
FILE_RCSID("@(#)$File: pread.c,v 1.5 2022/09/24 20:30:13 christos Exp $")
|
165 |
+
#endif /* lint */
|
166 |
+
#include <fcntl.h>
|
167 |
+
+#ifdef HAVE_UNISTD_H
|
168 |
+
#include <unistd.h>
|
169 |
+
+#endif
|
170 |
+
|
171 |
+
ssize_t
|
172 |
+
pread(int fd, void *buf, size_t len, off_t off) {
|
173 |
+
diff --git a/src/readcdf.c b/src/readcdf.c
|
174 |
+
index 7622c7b..977cb75 100644
|
175 |
+
--- a/src/readcdf.c
|
176 |
+
+++ b/src/readcdf.c
|
177 |
+
@@ -31,7 +31,9 @@ FILE_RCSID("@(#)$File: readcdf.c,v 1.74 2019/09/11 15:46:30 christos Exp $")
|
178 |
+
|
179 |
+
#include <assert.h>
|
180 |
+
#include <stdlib.h>
|
181 |
+
+#ifdef HAVE_UNISTD_H
|
182 |
+
#include <unistd.h>
|
183 |
+
+#endif
|
184 |
+
#include <string.h>
|
185 |
+
#include <time.h>
|
186 |
+
#include <ctype.h>
|
187 |
+
--
|
188 |
+
2.29.2.windows.2
|
189 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0007-Substitute-unistd-macros-for-MSVC.patch
ADDED
@@ -0,0 +1,30 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 1106d1523ed44bcbcca90fc1fe9fa9400777d8fe Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sun, 9 May 2021 10:28:49 +0700
|
4 |
+
Subject: [PATCH 07/14] Substitute unistd macros for MSVC
|
5 |
+
|
6 |
+
---
|
7 |
+
src/file.h | 7 +++++++
|
8 |
+
1 file changed, 7 insertions(+)
|
9 |
+
|
10 |
+
diff --git a/src/file.h b/src/file.h
|
11 |
+
index 4aa9f60..5da838c 100644
|
12 |
+
--- a/src/file.h
|
13 |
+
+++ b/src/file.h
|
14 |
+
@@ -85,6 +85,13 @@
|
15 |
+
#ifndef _WIN32
|
16 |
+
#include <sys/param.h>
|
17 |
+
#endif
|
18 |
+
+#ifdef _MSC_VER
|
19 |
+
+#include <io.h>
|
20 |
+
+#define R_OK 4
|
21 |
+
+#define W_OK 2
|
22 |
+
+#define X_OK R_OK
|
23 |
+
+#define F_OK 0
|
24 |
+
+#endif
|
25 |
+
/* Do this here and now, because struct stat gets re-defined on solaris */
|
26 |
+
#include <sys/stat.h>
|
27 |
+
#include <stdarg.h>
|
28 |
+
--
|
29 |
+
2.29.2.windows.2
|
30 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0008-Add-FILENO-defines.patch
ADDED
@@ -0,0 +1,26 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From e449e3fb47aee00f0d82782183cc7fd6b446d27b Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sun, 9 May 2021 13:24:42 +0700
|
4 |
+
Subject: [PATCH 08/14] Add FILENO defines
|
5 |
+
|
6 |
+
---
|
7 |
+
src/file.h | 3 +++
|
8 |
+
1 file changed, 3 insertions(+)
|
9 |
+
|
10 |
+
diff --git a/src/file.h b/src/file.h
|
11 |
+
index 5da838c..ccfe0da 100644
|
12 |
+
--- a/src/file.h
|
13 |
+
+++ b/src/file.h
|
14 |
+
@@ -91,6 +91,9 @@
|
15 |
+
#define W_OK 2
|
16 |
+
#define X_OK R_OK
|
17 |
+
#define F_OK 0
|
18 |
+
+#define STDIN_FILENO _fileno(stdin)
|
19 |
+
+#define STDOUT_FILENO _fileno(stdout)
|
20 |
+
+#define STDERR_FILENO _fileno(stderr)
|
21 |
+
#endif
|
22 |
+
/* Do this here and now, because struct stat gets re-defined on solaris */
|
23 |
+
#include <sys/stat.h>
|
24 |
+
--
|
25 |
+
2.29.2.windows.2
|
26 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0010-Properly-check-for-the-presence-of-bitmasks.patch
ADDED
@@ -0,0 +1,118 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From a6bc98ce25cd9d9dba896e93ed441ff162f6793b Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sun, 9 May 2021 17:43:20 +0700
|
4 |
+
Subject: [PATCH 10/14] Properly check for the presence of bitmasks
|
5 |
+
|
6 |
+
---
|
7 |
+
src/fsmagic.c | 24 ++++++++++++------------
|
8 |
+
1 file changed, 12 insertions(+), 12 deletions(-)
|
9 |
+
|
10 |
+
diff --git a/src/fsmagic.c b/src/fsmagic.c
|
11 |
+
index 5204f20..7244841 100644
|
12 |
+
--- a/src/fsmagic.c
|
13 |
+
+++ b/src/fsmagic.c
|
14 |
+
@@ -66,7 +66,7 @@ FILE_RCSID("@(#)$File: fsmagic.c,v 1.81 2019/07/16 13:30:32 christos Exp $")
|
15 |
+
# define minor(dev) ((dev) & 0xff)
|
16 |
+
#endif
|
17 |
+
#undef HAVE_MAJOR
|
18 |
+
-#ifdef S_IFLNK
|
19 |
+
+#if S_IFLNK != 0
|
20 |
+
file_private int
|
21 |
+
bad_link(struct magic_set *ms, int err, char *buf)
|
22 |
+
{
|
23 |
+
@@ -108,7 +108,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
24 |
+
int ret, did = 0;
|
25 |
+
int mime = ms->flags & MAGIC_MIME;
|
26 |
+
int silent = ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION);
|
27 |
+
-#ifdef S_IFLNK
|
28 |
+
+#if S_IFLNK != 0
|
29 |
+
char buf[BUFSIZ+4];
|
30 |
+
ssize_t nch;
|
31 |
+
struct stat tstatbuf;
|
32 |
+
@@ -122,7 +122,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
33 |
+
* Fstat is cheaper but fails for files you don't have read perms on.
|
34 |
+
* On 4.2BSD and similar systems, use lstat() to identify symlinks.
|
35 |
+
*/
|
36 |
+
-#ifdef S_IFLNK
|
37 |
+
+#if S_IFLNK != 0
|
38 |
+
if ((ms->flags & MAGIC_SYMLINK) == 0)
|
39 |
+
ret = lstat(fn, sb);
|
40 |
+
else
|
41 |
+
@@ -171,17 +171,17 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
42 |
+
|
43 |
+
ret = 1;
|
44 |
+
if (!mime && !silent) {
|
45 |
+
-#ifdef S_ISUID
|
46 |
+
+#if S_ISUID != 0
|
47 |
+
if (sb->st_mode & S_ISUID)
|
48 |
+
if (file_printf(ms, "%ssetuid", COMMA) == -1)
|
49 |
+
return -1;
|
50 |
+
#endif
|
51 |
+
-#ifdef S_ISGID
|
52 |
+
+#if S_ISGID != 0
|
53 |
+
if (sb->st_mode & S_ISGID)
|
54 |
+
if (file_printf(ms, "%ssetgid", COMMA) == -1)
|
55 |
+
return -1;
|
56 |
+
#endif
|
57 |
+
-#ifdef S_ISVTX
|
58 |
+
+#if S_ISVTX != 0
|
59 |
+
if (sb->st_mode & S_ISVTX)
|
60 |
+
if (file_printf(ms, "%ssticky", COMMA) == -1)
|
61 |
+
return -1;
|
62 |
+
@@ -197,7 +197,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
63 |
+
} else if (file_printf(ms, "%sdirectory", COMMA) == -1)
|
64 |
+
return -1;
|
65 |
+
break;
|
66 |
+
-#ifdef S_IFCHR
|
67 |
+
+#if S_IFCHR != 0
|
68 |
+
case S_IFCHR:
|
69 |
+
/*
|
70 |
+
* If -s has been specified, treat character special files
|
71 |
+
@@ -232,7 +232,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
72 |
+
}
|
73 |
+
break;
|
74 |
+
#endif
|
75 |
+
-#ifdef S_IFBLK
|
76 |
+
+#if S_IFBLK != 0
|
77 |
+
case S_IFBLK:
|
78 |
+
/*
|
79 |
+
* If -s has been specified, treat block special files
|
80 |
+
@@ -268,7 +268,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
81 |
+
break;
|
82 |
+
#endif
|
83 |
+
/* TODO add code to handle V7 MUX and Blit MUX files */
|
84 |
+
-#ifdef S_IFIFO
|
85 |
+
+#if S_IFIFO != 0
|
86 |
+
case S_IFIFO:
|
87 |
+
if((ms->flags & MAGIC_DEVICES) != 0)
|
88 |
+
break;
|
89 |
+
@@ -280,7 +280,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
90 |
+
return -1;
|
91 |
+
break;
|
92 |
+
#endif
|
93 |
+
-#ifdef S_IFDOOR
|
94 |
+
+#if S_IFDOOR != 0
|
95 |
+
case S_IFDOOR:
|
96 |
+
if (mime) {
|
97 |
+
if (handle_mime(ms, mime, "door") == -1)
|
98 |
+
@@ -290,7 +290,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
99 |
+
return -1;
|
100 |
+
break;
|
101 |
+
#endif
|
102 |
+
-#ifdef S_IFLNK
|
103 |
+
+#if S_IFLNK != 0
|
104 |
+
case S_IFLNK:
|
105 |
+
if ((nch = readlink(fn, buf, BUFSIZ-1)) <= 0) {
|
106 |
+
if (ms->flags & MAGIC_ERROR) {
|
107 |
+
@@ -378,7 +378,7 @@ file_fsmagic(struct magic_set *ms, const char *fn, struct stat *sb)
|
108 |
+
}
|
109 |
+
break;
|
110 |
+
#endif
|
111 |
+
-#ifdef S_IFSOCK
|
112 |
+
+#if S_IFSOCK != 0
|
113 |
+
#ifndef __COHERENT__
|
114 |
+
case S_IFSOCK:
|
115 |
+
if (mime) {
|
116 |
+
--
|
117 |
+
2.29.2.windows.2
|
118 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0011-Remove-pipe-related-functions-in-funcs.c.patch
ADDED
@@ -0,0 +1,30 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 15b0f505ff9eefd41b74ffdd4230355e933263ca Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Sun, 9 May 2021 17:45:50 +0700
|
4 |
+
Subject: [PATCH 11/14] Remove pipe related functions in funcs.c
|
5 |
+
|
6 |
+
---
|
7 |
+
src/funcs.c | 2 ++
|
8 |
+
1 file changed, 2 insertions(+)
|
9 |
+
|
10 |
+
diff --git a/src/funcs.c b/src/funcs.c
|
11 |
+
index b926625..b585486 100644
|
12 |
+
--- a/src/funcs.c
|
13 |
+
+++ b/src/funcs.c
|
14 |
+
@@ -888,5 +888,6 @@
|
15 |
+
}
|
16 |
+
|
17 |
+
+#ifndef _WIN32
|
18 |
+
file_protected int
|
19 |
+
file_pipe_closexec(int *fds)
|
20 |
+
{
|
21 |
+
@@ -914,5 +915,6 @@
|
22 |
+
#endif
|
23 |
+
}
|
24 |
+
+#endif
|
25 |
+
|
26 |
+
file_protected char *
|
27 |
+
file_strtrim(char *str)
|
28 |
+
--
|
29 |
+
2.29.2.windows.2
|
30 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0012-Convert-MSYS2-paths-to-Windows-paths.patch
ADDED
@@ -0,0 +1,24 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From f0139ced57c1579450f3d09b6e3ae0159aae031b Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Mon, 10 May 2021 08:43:28 +0700
|
4 |
+
Subject: [PATCH 12/14] Convert MSYS2 paths to Windows paths
|
5 |
+
|
6 |
+
---
|
7 |
+
src/Makefile.am | 3 +++
|
8 |
+
1 file changed, 3 insertions(+)
|
9 |
+
|
10 |
+
diff --git a/src/Makefile.am b/src/Makefile.am
|
11 |
+
index 34781b9..26f853f 100644
|
12 |
+
--- a/src/Makefile.am
|
13 |
+
+++ b/src/Makefile.am
|
14 |
+
@@ -1,4 +1,7 @@
|
15 |
+
MAGIC = $(pkgdatadir)/magic
|
16 |
+
+if MINGW
|
17 |
+
+MAGIC != cygpath -m -a -l '$(MAGIC)'
|
18 |
+
+endif
|
19 |
+
lib_LTLIBRARIES = libmagic.la
|
20 |
+
nodist_include_HEADERS = magic.h
|
21 |
+
|
22 |
+
--
|
23 |
+
2.29.2.windows.2
|
24 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0013-Check-for-backslash-in-argv-0-on-Windows.patch
ADDED
@@ -0,0 +1,42 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
From 3f10c7d31627b64b068b84ba72e706991f672560 Mon Sep 17 00:00:00 2001
|
2 |
+
From: Long Nguyen <[email protected]>
|
3 |
+
Date: Fri, 14 May 2021 08:14:05 +0700
|
4 |
+
Subject: [PATCH 13/14] Check for backslash in argv[0] on Windows
|
5 |
+
|
6 |
+
---
|
7 |
+
magic/Makefile.am | 2 +-
|
8 |
+
src/file.c | 5 +++++
|
9 |
+
2 files changed, 6 insertions(+), 1 deletion(-)
|
10 |
+
|
11 |
+
diff --git a/magic/Makefile.am b/magic/Makefile.am
|
12 |
+
index 0eb5865..170bbab 100644
|
13 |
+
--- a/magic/Makefile.am
|
14 |
+
+++ b/magic/Makefile.am
|
15 |
+
@@ -353,7 +353,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
|
16 |
+
@(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
|
17 |
+
echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
|
18 |
+
else \
|
19 |
+
- v=$$(${FILE_COMPILE} --version | sed -e s/file-// -e q); \
|
20 |
+
+ v=$$(${FILE_COMPILE} --version | sed -e s/file${EXEEXT}-// -e q); \
|
21 |
+
if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
|
22 |
+
echo "Cannot use the installed version of file ($$v) to"; \
|
23 |
+
echo "cross-compile file ${PACKAGE_VERSION}"; \
|
24 |
+
diff --git a/src/file.c b/src/file.c
|
25 |
+
index 2889f8a..12a604b 100644
|
26 |
+
--- a/src/file.c
|
27 |
+
+++ b/src/file.c
|
28 |
+
@@ -200,6 +200,11 @@ main(int argc, char *argv[])
|
29 |
+
_wildcard(&argc, &argv);
|
30 |
+
#endif
|
31 |
+
|
32 |
+
+#ifdef _WIN32
|
33 |
+
+ if ((progname = strrchr(argv[0], '\\')) != NULL)
|
34 |
+
+ progname++;
|
35 |
+
+ else
|
36 |
+
+#endif
|
37 |
+
if ((progname = strrchr(argv[0], '/')) != NULL)
|
38 |
+
progname++;
|
39 |
+
else
|
40 |
+
--
|
41 |
+
2.29.2.windows.2
|
42 |
+
|
cc-multilingual-main/cc_net/vcpkg/ports/libmagic/0015-MSYS2-Remove-ioctl-call.patch
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
# From https://github.com/msys2/MINGW-packages/commit/3a51faadb8bacf06c7b7fd84b2ea80775d1a8b0d
|
2 |
+
|
3 |
+
# this is an advanced patch to fix building v5.38
|
4 |
+
# see for details
|
5 |
+
# this patch should be removed with the next version
|
6 |
+
diff --git a/src/compress.c b/src/compress.c
|
7 |
+
index 33ce2bc..f172eda 100644
|
8 |
+
--- a/src/compress.c
|
9 |
+
+++ b/src/compress.c
|
10 |
+
@@ -407,7 +407,7 @@
|
11 |
+
sread(int fd, void *buf, size_t n, int canbepipe __attribute__((__unused__)))
|
12 |
+
{
|
13 |
+
ssize_t rv;
|
14 |
+
-#if defined(FIONREAD) && !defined(__MINGW32__)
|
15 |
+
+#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32)
|
16 |
+
int t = 0;
|
17 |
+
#endif
|
18 |
+
size_t rn = n;
|
19 |
+
@@ -418,7 +418,7 @@
|
20 |
+
if (fd == STDIN_FILENO)
|
21 |
+
goto nocheck;
|
22 |
+
|
23 |
+
-#if defined(FIONREAD) && !defined(__MINGW32__)
|
24 |
+
+#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32)
|
25 |
+
if (canbepipe && (ioctl(fd, FIONREAD, &t) == -1 || t == 0)) {
|
26 |
+
#ifdef FD_ZERO
|
27 |
+
ssize_t cnt;
|