diff --git a/ports/libmagic/portfile.cmake b/ports/libmagic/portfile.cmake index b125a3b262d7ba..d04f65c1052a05 100644 --- a/ports/libmagic/portfile.cmake +++ b/ports/libmagic/portfile.cmake @@ -32,6 +32,11 @@ if(VCPKG_TARGET_IS_WINDOWS) set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS") endif() +if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -DBUILD_AS_WINDOWS_STATIC_LIBARAY") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} -DBUILD_AS_WINDOWS_STATIC_LIBARAY") +endif() + set(FEATURE_OPTIONS) macro(enable_feature feature switch) diff --git a/ports/libmagic/vcpkg.json b/ports/libmagic/vcpkg.json index 2fd5916e792012..a7357d62618dc0 100644 --- a/ports/libmagic/vcpkg.json +++ b/ports/libmagic/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libmagic", "version": "5.46", - "port-version": 1, + "port-version": 2, "description": "This library can be used to classify files according to magic number tests.", "homepage": "https://github.com/file/file", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index d66bbff51fcb1b..cf11cbb9b9e15a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4834,7 +4834,7 @@ }, "libmagic": { "baseline": "5.46", - "port-version": 1 + "port-version": 2 }, "libmariadb": { "baseline": "3.4.1", diff --git a/versions/l-/libmagic.json b/versions/l-/libmagic.json index 9787bb14e2c087..a664c54b1a2757 100644 --- a/versions/l-/libmagic.json +++ b/versions/l-/libmagic.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "41586f5bc835926bf3a4ba4bfc79be735ca581d3", + "version": "5.46", + "port-version": 2 + }, { "git-tree": "64418c4e61811c2e8829f8253c56173a2836bbcd", "version": "5.46",