From b536a86ed45c4142be7101c9c610d5466e327673 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 21 Aug 2025 01:53:47 +0900 Subject: [PATCH 01/11] [glaze] update to 5.6.0 --- ports/glaze/portfile.cmake | 9 ++++++--- ports/glaze/vcpkg.json | 5 ++++- versions/baseline.json | 2 +- versions/g-/glaze.json | 5 +++++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 786d7b5fd2d721..28da947bd7f7dc 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,13 +6,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 23ddfebd05cb54a81677dc314a2b21c74cc2d35c362262d99178ecd64067aac2cb0cee14b1cd91de4d45c6980758f80e218d1d5f7e3f15f0bf00583b675ef8de + SHA512 8bacfaee61f98147dfea7cbb3c7a3feb074ea953a32e33f985ee21d83840e1937fbd2f92cd6306c8349b511839a400e111844e446d732d724307ed2b5b02348a HEAD_REF main ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - ssl glaze_ENABLE_SSL + interop glaze_BUILD_INTEROP + ssl glaze_ENABLE_SSL ) vcpkg_cmake_configure( @@ -26,6 +27,8 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +if(NOT "interop" IN_LIST FEATURES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index ba32c99ec98e29..ee960f8d8be696 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "5.5.5", + "version": "5.6.0", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", @@ -16,6 +16,9 @@ } ], "features": { + "interop": { + "description": "Build language interoperability library" + }, "ssl": { "description": "Enable SSL/TLS support for HTTPS servers", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 1445c42434bcc8..2d827558ccde01 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3293,7 +3293,7 @@ "port-version": 0 }, "glaze": { - "baseline": "5.5.5", + "baseline": "5.6.0", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 593167432dabb4..f2d0904a6e542c 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4ec42dad1e878668aa78407f9370302dfff096e", + "version": "5.6.0", + "port-version": 0 + }, { "git-tree": "028b117eb99342226cf002284e1fde7687857803", "version": "5.5.5", From 82e6a821df692c55b1c772bcdbb89440424b957a Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 21 Aug 2025 02:14:34 +0900 Subject: [PATCH 02/11] delete debug headers --- ports/glaze/portfile.cmake | 2 ++ scripts/ci.baseline.txt | 2 ++ versions/g-/glaze.json | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 28da947bd7f7dc..0ee668d1dee54f 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -29,6 +29,8 @@ vcpkg_cmake_config_fixup() if(NOT "interop" IN_LIST FEATURES) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index a1f24880fd9ab0..5f80ad5eba4524 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -370,6 +370,8 @@ gherkin-c:x86-windows=skip gl3w:arm-neon-android=fail gl3w:arm64-android=fail gl3w:x64-android=fail +# glaze requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. +glaze:x64-linux=fail glfw3:arm-neon-android=fail glfw3:arm64-android=fail glfw3:arm64-uwp=fail diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index f2d0904a6e542c..690dd31a854040 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e4ec42dad1e878668aa78407f9370302dfff096e", + "git-tree": "3cf09d21dd90a5358ff4f02f43cb749102ca0066", "version": "5.6.0", "port-version": 0 }, From ed9fc16d1d664291fc1e3bf9587f0af0164e0ad6 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 21 Aug 2025 09:02:31 +0900 Subject: [PATCH 03/11] support win64 on interop feature --- ports/glaze/portfile.cmake | 2 ++ ports/glaze/support-win64.patch | 31 +++++++++++++++++++++++++++++++ scripts/ci.feature.baseline.txt | 2 ++ versions/g-/glaze.json | 2 +- 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 ports/glaze/support-win64.patch diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 0ee668d1dee54f..fb51d9d825f143 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 8bacfaee61f98147dfea7cbb3c7a3feb074ea953a32e33f985ee21d83840e1937fbd2f92cd6306c8349b511839a400e111844e446d732d724307ed2b5b02348a HEAD_REF main + PATCHES + support-win64.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/glaze/support-win64.patch b/ports/glaze/support-win64.patch new file mode 100644 index 00000000000000..412db22dbdcaa4 --- /dev/null +++ b/ports/glaze/support-win64.patch @@ -0,0 +1,31 @@ +diff --git a/include/glaze/interop/interop.hpp b/include/glaze/interop/interop.hpp +index b6ef0c2..3354f81 100644 +--- a/include/glaze/interop/interop.hpp ++++ b/include/glaze/interop/interop.hpp +@@ -127,7 +127,7 @@ static_assert(sizeof(glz_string_desc) == 8, "glz_string_desc must be 8 bytes"); + static_assert(sizeof(glz_complex_desc) == 8, "glz_complex_desc must be 8 bytes"); + + // Pointer sizes vary between 32-bit and 64-bit systems +-#ifdef __LP64__ ++#if defined(__LP64__) || defined(_WIN64) + // 64-bit system + static_assert(sizeof(glz_vector_desc) == 8, "glz_vector_desc must be 8 bytes on 64-bit"); + static_assert(sizeof(glz_map_desc) == 16, "glz_map_desc must be 16 bytes on 64-bit"); +@@ -167,7 +167,7 @@ struct glz_type_descriptor + }; + + // Verify the overall type descriptor size +-#ifdef __LP64__ ++#if defined(__LP64__) || defined(_WIN64) + static_assert(sizeof(glz_type_descriptor) == 40, "glz_type_descriptor must be 40 bytes on 64-bit"); + #else + static_assert(sizeof(glz_type_descriptor) == 28, "glz_type_descriptor must be 28 bytes on 32-bit"); +@@ -1311,7 +1311,7 @@ struct glz_unordered_map + }; + + // Static assertions for the C structs +-#ifdef __LP64__ ++#if defined(__LP64__) || defined(_WIN64) + // 64-bit system + static_assert(sizeof(glz_member_info) == 48, "glz_member_info must be 48 bytes on 64-bit"); + static_assert(sizeof(glz_type_info) == 32, "glz_type_info must be 32 bytes on 64-bit"); diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 881071c1f37376..e2188854c067e8 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -137,6 +137,8 @@ geotrans = skip # Port geotrans source ftp://ftp.nga.mil server extremely slow m getopt:arm-uwp=fail getopt:x64-uwp=fail gflags(uwp)=fail +# glaze requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. +glaze:x64-linux=fail glfw3(uwp)=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 690dd31a854040..9f35f5c9432700 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3cf09d21dd90a5358ff4f02f43cb749102ca0066", + "git-tree": "b51f8750d8a504aff5b264e8321314b72552d791", "version": "5.6.0", "port-version": 0 }, From b0e8bb5f9146f3c3c1817059758cf0d817b5b657 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 21 Aug 2025 19:26:10 +0900 Subject: [PATCH 04/11] set VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY --- ports/glaze/portfile.cmake | 8 +++++--- versions/g-/glaze.json | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index fb51d9d825f143..bd15ddc1f598d5 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -29,10 +29,12 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup() -if(NOT "interop" IN_LIST FEATURES) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -else() +if("interop" IN_LIST FEATURES) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + # interop produces shared library with static client library. + set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") endif() vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 9f35f5c9432700..91cadc838a8536 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "b51f8750d8a504aff5b264e8321314b72552d791", + "git-tree": "1e368bddaf75cb24e8ba009971c646319eea711f", "version": "5.6.0", "port-version": 0 }, From 7d75844e78290b0b0503448e1c628ecd5149172d Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 30 Aug 2025 00:30:56 +0900 Subject: [PATCH 05/11] update to 5.6.1 --- ports/glaze/portfile.cmake | 2 +- ports/glaze/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/glaze.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index bd15ddc1f598d5..33d5121a31fdf8 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stephenberry/glaze REF "v${VERSION}" - SHA512 8bacfaee61f98147dfea7cbb3c7a3feb074ea953a32e33f985ee21d83840e1937fbd2f92cd6306c8349b511839a400e111844e446d732d724307ed2b5b02348a + SHA512 f19e001fd6025594eb546ed7993bab73b303b064bf9563148f172a9c6dbbba9e6de41997be5284ca148908a307fe282e67974489df68fca699b9fb25ce4e7af0 HEAD_REF main PATCHES support-win64.patch diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index ee960f8d8be696..126fca963d3a00 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -1,6 +1,6 @@ { "name": "glaze", - "version": "5.6.0", + "version": "5.6.1", "description": "One of the fastest JSON libraries in the world. Glaze reads and writes from C++ memory, simplifying interfaces and offering incredible performance.", "homepage": "https://github.com/stephenberry/glaze", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 2d827558ccde01..19a83cf377067d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3293,7 +3293,7 @@ "port-version": 0 }, "glaze": { - "baseline": "5.6.0", + "baseline": "5.6.1", "port-version": 0 }, "glbinding": { diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 91cadc838a8536..6f79eb2c9066a0 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "1e368bddaf75cb24e8ba009971c646319eea711f", - "version": "5.6.0", + "git-tree": "8ddecdca6a0ffd14223fd2e2f3d30d87918933f4", + "version": "5.6.1", "port-version": 0 }, { From 7b52d24bfc8e7c4ba8c6fdb024b6f149e31640d2 Mon Sep 17 00:00:00 2001 From: toge Date: Sat, 30 Aug 2025 18:26:25 +0900 Subject: [PATCH 06/11] update ci scripts --- scripts/ci.baseline.txt | 2 -- scripts/ci.feature.baseline.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5f80ad5eba4524..a1f24880fd9ab0 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -370,8 +370,6 @@ gherkin-c:x86-windows=skip gl3w:arm-neon-android=fail gl3w:arm64-android=fail gl3w:x64-android=fail -# glaze requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. -glaze:x64-linux=fail glfw3:arm-neon-android=fail glfw3:arm64-android=fail glfw3:arm64-uwp=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index e2188854c067e8..a3137fd62c154d 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -138,7 +138,7 @@ getopt:arm-uwp=fail getopt:x64-uwp=fail gflags(uwp)=fail # glaze requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. -glaze:x64-linux=fail +glaze[interop]:x64-linux=fail glfw3(uwp)=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail From 42c0ff8bad2e2a6259f0de401ba13f1c7d99e419 Mon Sep 17 00:00:00 2001 From: toge Date: Sun, 31 Aug 2025 00:59:02 +0900 Subject: [PATCH 07/11] use feature-fails --- scripts/ci.feature.baseline.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index a3137fd62c154d..bddf38ae52d41c 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -138,7 +138,7 @@ getopt:arm-uwp=fail getopt:x64-uwp=fail gflags(uwp)=fail # glaze requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. -glaze[interop]:x64-linux=fail +glaze[interop]:x64-linux=feature-fails glfw3(uwp)=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail From 6f39198bedcaeee3b60c86b6df6c614a66d69162 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 2 Sep 2025 17:02:42 +0900 Subject: [PATCH 08/11] support x86-windows --- ports/glaze/portfile.cmake | 2 +- ...{support-win64.patch => support-win.patch} | 22 ++++++++++++++++--- versions/g-/glaze.json | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) rename ports/glaze/{support-win64.patch => support-win.patch} (56%) diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 33d5121a31fdf8..5d0432f16a146b 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -9,7 +9,7 @@ vcpkg_from_github( SHA512 f19e001fd6025594eb546ed7993bab73b303b064bf9563148f172a9c6dbbba9e6de41997be5284ca148908a307fe282e67974489df68fca699b9fb25ce4e7af0 HEAD_REF main PATCHES - support-win64.patch + support-win.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/glaze/support-win64.patch b/ports/glaze/support-win.patch similarity index 56% rename from ports/glaze/support-win64.patch rename to ports/glaze/support-win.patch index 412db22dbdcaa4..3c9f38af54547c 100644 --- a/ports/glaze/support-win64.patch +++ b/ports/glaze/support-win.patch @@ -1,5 +1,5 @@ diff --git a/include/glaze/interop/interop.hpp b/include/glaze/interop/interop.hpp -index b6ef0c2..3354f81 100644 +index b6ef0c2..52d556a 100644 --- a/include/glaze/interop/interop.hpp +++ b/include/glaze/interop/interop.hpp @@ -127,7 +127,7 @@ static_assert(sizeof(glz_string_desc) == 8, "glz_string_desc must be 8 bytes"); @@ -11,16 +11,32 @@ index b6ef0c2..3354f81 100644 // 64-bit system static_assert(sizeof(glz_vector_desc) == 8, "glz_vector_desc must be 8 bytes on 64-bit"); static_assert(sizeof(glz_map_desc) == 16, "glz_map_desc must be 16 bytes on 64-bit"); -@@ -167,7 +167,7 @@ struct glz_type_descriptor +@@ -144,8 +144,12 @@ static_assert(sizeof(glz_struct_desc) == 12, "glz_struct_desc must be 12 bytes o + static_assert(sizeof(glz_optional_desc) == 4, "glz_optional_desc must be 4 bytes on 32-bit"); + static_assert(sizeof(glz_function_desc) == 20, "glz_function_desc must be 20 bytes on 32-bit"); + static_assert(sizeof(glz_shared_future_desc) == 4, "glz_shared_future_desc must be 4 bytes on 32-bit"); ++#ifdef _WIN32 ++static_assert(sizeof(glz_variant_desc) == 24, "glz_variant_desc must be 24 bytes on 32-bit"); ++#else + static_assert(sizeof(glz_variant_desc) == 20, "glz_variant_desc must be 20 bytes on 32-bit"); + #endif ++#endif + + // The variant-like type descriptor - properly aligned + struct glz_type_descriptor +@@ -167,8 +171,10 @@ struct glz_type_descriptor }; // Verify the overall type descriptor size -#ifdef __LP64__ +#if defined(__LP64__) || defined(_WIN64) static_assert(sizeof(glz_type_descriptor) == 40, "glz_type_descriptor must be 40 bytes on 64-bit"); ++#elif defined(_WIN32) ++static_assert(sizeof(glz_type_descriptor) == 32, "glz_type_descriptor must be 32 bytes on 32-bit"); #else static_assert(sizeof(glz_type_descriptor) == 28, "glz_type_descriptor must be 28 bytes on 32-bit"); -@@ -1311,7 +1311,7 @@ struct glz_unordered_map + #endif +@@ -1311,7 +1317,7 @@ struct glz_unordered_map }; // Static assertions for the C structs diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 6f79eb2c9066a0..83f86813e70bc7 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "8ddecdca6a0ffd14223fd2e2f3d30d87918933f4", + "git-tree": "33ac668e33e0a2e92b289fc05f309fd0779d7902", "version": "5.6.1", "port-version": 0 }, From 5ed262def82006e3689cdd0e4736b56c354e5488 Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 2 Sep 2025 18:13:32 +0900 Subject: [PATCH 09/11] support android-arm-android --- ports/glaze/support-win.patch | 22 ++++++++++------------ versions/g-/glaze.json | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/ports/glaze/support-win.patch b/ports/glaze/support-win.patch index 3c9f38af54547c..b7f6883947d25e 100644 --- a/ports/glaze/support-win.patch +++ b/ports/glaze/support-win.patch @@ -1,5 +1,6 @@ + diff --git a/include/glaze/interop/interop.hpp b/include/glaze/interop/interop.hpp -index b6ef0c2..52d556a 100644 +index b6ef0c2..ebee37c 100644 --- a/include/glaze/interop/interop.hpp +++ b/include/glaze/interop/interop.hpp @@ -127,7 +127,7 @@ static_assert(sizeof(glz_string_desc) == 8, "glz_string_desc must be 8 bytes"); @@ -11,32 +12,29 @@ index b6ef0c2..52d556a 100644 // 64-bit system static_assert(sizeof(glz_vector_desc) == 8, "glz_vector_desc must be 8 bytes on 64-bit"); static_assert(sizeof(glz_map_desc) == 16, "glz_map_desc must be 16 bytes on 64-bit"); -@@ -144,8 +144,12 @@ static_assert(sizeof(glz_struct_desc) == 12, "glz_struct_desc must be 12 bytes o +@@ -144,7 +144,7 @@ static_assert(sizeof(glz_struct_desc) == 12, "glz_struct_desc must be 12 bytes o static_assert(sizeof(glz_optional_desc) == 4, "glz_optional_desc must be 4 bytes on 32-bit"); static_assert(sizeof(glz_function_desc) == 20, "glz_function_desc must be 20 bytes on 32-bit"); static_assert(sizeof(glz_shared_future_desc) == 4, "glz_shared_future_desc must be 4 bytes on 32-bit"); -+#ifdef _WIN32 +-static_assert(sizeof(glz_variant_desc) == 20, "glz_variant_desc must be 20 bytes on 32-bit"); +static_assert(sizeof(glz_variant_desc) == 24, "glz_variant_desc must be 24 bytes on 32-bit"); -+#else - static_assert(sizeof(glz_variant_desc) == 20, "glz_variant_desc must be 20 bytes on 32-bit"); #endif -+#endif // The variant-like type descriptor - properly aligned - struct glz_type_descriptor -@@ -167,8 +171,10 @@ struct glz_type_descriptor +@@ -167,10 +167,10 @@ struct glz_type_descriptor }; // Verify the overall type descriptor size -#ifdef __LP64__ +#if defined(__LP64__) || defined(_WIN64) static_assert(sizeof(glz_type_descriptor) == 40, "glz_type_descriptor must be 40 bytes on 64-bit"); -+#elif defined(_WIN32) -+static_assert(sizeof(glz_type_descriptor) == 32, "glz_type_descriptor must be 32 bytes on 32-bit"); #else - static_assert(sizeof(glz_type_descriptor) == 28, "glz_type_descriptor must be 28 bytes on 32-bit"); +-static_assert(sizeof(glz_type_descriptor) == 28, "glz_type_descriptor must be 28 bytes on 32-bit"); ++static_assert(sizeof(glz_type_descriptor) == 32, "glz_type_descriptor must be 32 bytes on 32-bit"); #endif -@@ -1311,7 +1317,7 @@ struct glz_unordered_map + + namespace glz +@@ -1311,7 +1311,7 @@ struct glz_unordered_map }; // Static assertions for the C structs diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 83f86813e70bc7..52ebe85160c863 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "33ac668e33e0a2e92b289fc05f309fd0779d7902", + "git-tree": "eb3fa5ce2e202e868fbb2b0c019d9145bad3c45f", "version": "5.6.1", "port-version": 0 }, From 7253a56efe0aca964d1a420fad4269de7ae1344c Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 4 Sep 2025 15:20:48 +0900 Subject: [PATCH 10/11] remove interop feature --- ports/glaze/portfile.cmake | 11 +-------- ports/glaze/support-win.patch | 45 ----------------------------------- ports/glaze/vcpkg.json | 3 --- versions/g-/glaze.json | 2 +- 4 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 ports/glaze/support-win.patch diff --git a/ports/glaze/portfile.cmake b/ports/glaze/portfile.cmake index 5d0432f16a146b..963b6d4356b4de 100644 --- a/ports/glaze/portfile.cmake +++ b/ports/glaze/portfile.cmake @@ -8,13 +8,10 @@ vcpkg_from_github( REF "v${VERSION}" SHA512 f19e001fd6025594eb546ed7993bab73b303b064bf9563148f172a9c6dbbba9e6de41997be5284ca148908a307fe282e67974489df68fca699b9fb25ce4e7af0 HEAD_REF main - PATCHES - support-win.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - interop glaze_BUILD_INTEROP ssl glaze_ENABLE_SSL ) @@ -29,12 +26,6 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup() -if("interop" IN_LIST FEATURES) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - # interop produces shared library with static client library. - set(VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY enabled) -else() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug") vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/glaze/support-win.patch b/ports/glaze/support-win.patch deleted file mode 100644 index b7f6883947d25e..00000000000000 --- a/ports/glaze/support-win.patch +++ /dev/null @@ -1,45 +0,0 @@ - -diff --git a/include/glaze/interop/interop.hpp b/include/glaze/interop/interop.hpp -index b6ef0c2..ebee37c 100644 ---- a/include/glaze/interop/interop.hpp -+++ b/include/glaze/interop/interop.hpp -@@ -127,7 +127,7 @@ static_assert(sizeof(glz_string_desc) == 8, "glz_string_desc must be 8 bytes"); - static_assert(sizeof(glz_complex_desc) == 8, "glz_complex_desc must be 8 bytes"); - - // Pointer sizes vary between 32-bit and 64-bit systems --#ifdef __LP64__ -+#if defined(__LP64__) || defined(_WIN64) - // 64-bit system - static_assert(sizeof(glz_vector_desc) == 8, "glz_vector_desc must be 8 bytes on 64-bit"); - static_assert(sizeof(glz_map_desc) == 16, "glz_map_desc must be 16 bytes on 64-bit"); -@@ -144,7 +144,7 @@ static_assert(sizeof(glz_struct_desc) == 12, "glz_struct_desc must be 12 bytes o - static_assert(sizeof(glz_optional_desc) == 4, "glz_optional_desc must be 4 bytes on 32-bit"); - static_assert(sizeof(glz_function_desc) == 20, "glz_function_desc must be 20 bytes on 32-bit"); - static_assert(sizeof(glz_shared_future_desc) == 4, "glz_shared_future_desc must be 4 bytes on 32-bit"); --static_assert(sizeof(glz_variant_desc) == 20, "glz_variant_desc must be 20 bytes on 32-bit"); -+static_assert(sizeof(glz_variant_desc) == 24, "glz_variant_desc must be 24 bytes on 32-bit"); - #endif - - // The variant-like type descriptor - properly aligned -@@ -167,10 +167,10 @@ struct glz_type_descriptor - }; - - // Verify the overall type descriptor size --#ifdef __LP64__ -+#if defined(__LP64__) || defined(_WIN64) - static_assert(sizeof(glz_type_descriptor) == 40, "glz_type_descriptor must be 40 bytes on 64-bit"); - #else --static_assert(sizeof(glz_type_descriptor) == 28, "glz_type_descriptor must be 28 bytes on 32-bit"); -+static_assert(sizeof(glz_type_descriptor) == 32, "glz_type_descriptor must be 32 bytes on 32-bit"); - #endif - - namespace glz -@@ -1311,7 +1311,7 @@ struct glz_unordered_map - }; - - // Static assertions for the C structs --#ifdef __LP64__ -+#if defined(__LP64__) || defined(_WIN64) - // 64-bit system - static_assert(sizeof(glz_member_info) == 48, "glz_member_info must be 48 bytes on 64-bit"); - static_assert(sizeof(glz_type_info) == 32, "glz_type_info must be 32 bytes on 64-bit"); diff --git a/ports/glaze/vcpkg.json b/ports/glaze/vcpkg.json index 126fca963d3a00..37e72893fe98fd 100644 --- a/ports/glaze/vcpkg.json +++ b/ports/glaze/vcpkg.json @@ -16,9 +16,6 @@ } ], "features": { - "interop": { - "description": "Build language interoperability library" - }, "ssl": { "description": "Enable SSL/TLS support for HTTPS servers", "dependencies": [ diff --git a/versions/g-/glaze.json b/versions/g-/glaze.json index 52ebe85160c863..900106e1c5d233 100644 --- a/versions/g-/glaze.json +++ b/versions/g-/glaze.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eb3fa5ce2e202e868fbb2b0c019d9145bad3c45f", + "git-tree": "63eab728e35f8da79a077cc0f01ed8bf8b9efd0c", "version": "5.6.1", "port-version": 0 }, From 8aa6ccceb89f5a928b4761f966e2007231e57fa8 Mon Sep 17 00:00:00 2001 From: toge Date: Thu, 4 Sep 2025 19:07:14 +0900 Subject: [PATCH 11/11] remove glaze[interop] --- scripts/ci.feature.baseline.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index bddf38ae52d41c..881071c1f37376 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -137,8 +137,6 @@ geotrans = skip # Port geotrans source ftp://ftp.nga.mil server extremely slow m getopt:arm-uwp=fail getopt:x64-uwp=fail gflags(uwp)=fail -# glaze requires gcc12 and clang15 or later. linux-x64 always fails because it uses gcc11. -glaze[interop]:x64-linux=feature-fails glfw3(uwp)=fail glibmm:x64-windows-static-md=fail glibmm:x64-windows-static=fail