3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 02:11:58 +08:00
Code Issues Projects Releases Wiki Activity

[glib] Support static build on Windows. (#25937)

Browse Source 
* [glib] Support static build on Windows.

As suggested by @Neumann-A

* Remove ci.baseline.txt entries.

* ci.baseline.txt updates.

REGRESSION: atk:x64-windows-static failed with BUILD_FAILED. If expected, add atk:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: gdk-pixbuf:x64-windows-static failed with BUILD_FAILED. If expected, add gdk-pixbuf:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: glibmm:x64-windows-static failed with BUILD_FAILED. If expected, add glibmm:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: glibmm:x64-windows-static-md failed with BUILD_FAILED. If expected, add glibmm:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: gstreamer:x64-windows-static failed with BUILD_FAILED. If expected, add gstreamer:x64-windows-static=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: gstreamer:x64-windows-static-md failed with BUILD_FAILED. If expected, add gstreamer:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: lcm:x64-windows-static-md failed with BUILD_FAILED. If expected, add lcm:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
REGRESSION: libgxps:x64-windows-static-md failed with BUILD_FAILED. If expected, add libgxps:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
Previously blocked by glib supports expression.

REGRESSION: mfl:x64-windows-static-md failed with BUILD_FAILED. If expected, add mfl:x64-windows-static-md=fail to C:\a\1\s\scripts\azure-pipelines/../ci.baseline.txt.
This was not blocked before but it's an ICE; I'm going to hope it's intermittent I guess?

Drive by fixed alphabetizing boringssl.

* [mfl] Skip ICE.

* openscap was previously blocked by the supports, the others are just extending the static-md skip to static.
This commit is contained in:
Billy O'Neal 2022-08-03 18:59:19 -07:00 committed by GitHub
parent 6a29f32abb
commit 42886097a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/glib/portfile.cmake
View File

@ -1,9 +1,3 @@
# Glib relies on DllMain on Windows
if (VCPKG_TARGET_IS_WINDOWS)
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
#remove if merged: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1655
endif()
set(GLIB_MAJOR_MINOR 2.72)
set(GLIB_PATCH 3)
vcpkg_from_gitlab(

4
ports/glib/vcpkg.json
View File

@ -1,11 +1,11 @@
{
"name": "glib",
"version": "2.72.3",
"port-version": 1,
"port-version": 2,
"description": "Portable, general-purpose utility library.",
"homepage": "https://developer.gnome.org/glib/",
"license": "LGPL-2.1-only",
"supports": "!uwp & !(windows & static)",
"supports": "!uwp",
"dependencies": [
"dirent",
"gettext",

79
scripts/ci.baseline.txt
View File

@ -34,25 +34,9 @@
# Add new items alphabetically
# script ports
#vcpkg-cmake:arm64-windows=fail
#vcpkg-cmake:arm-uwp=fail
#vcpkg-cmake:x64-uwp=fail
#vcpkg-cmake:x64-windows-static=fail
#vcpkg-cmake:x64-windows-static-md=fail
#vcpkg-cmake:x86-windows=fail
#vcpkg-cmake-config:arm64-windows=fail
#vcpkg-cmake-config:arm-uwp=fail
#vcpkg-cmake-config:x64-uwp=fail
#vcpkg-cmake-config:x64-windows-static=fail
#vcpkg-cmake-config:x64-windows-static-md=fail
#vcpkg-cmake-config:x86-windows=fail
# other ports
# Cross compiling CI machine cannot run gen_test_char to generate apr_escape_test_char.h
apr:arm64-windows=fail
atk:x64-windows-static=fail
# broken when `python` is python3, https://github.com/microsoft/vcpkg/issues/18937
bde:x64-linux=fail
bitserializer:x64-osx=fail
@ -60,6 +44,17 @@ bitserializer:arm64-osx=fail
blitz:x64-uwp=fail
blitz:arm64-windows=fail
blitz:arm-uwp=fail
# Conflicts with openssl
boringssl:arm64-windows=skip
boringssl:arm-uwp=skip
boringssl:x64-linux=skip
boringssl:x64-osx=skip
boringssl:arm64-osx=skip
boringssl:x64-uwp=skip
boringssl:x64-windows=skip
boringssl:x64-windows-static=skip
boringssl:x64-windows-static-md=skip
boringssl:x86-windows=skip
bond:arm-uwp=fail
bond:x64-osx=fail
bond:arm64-osx=fail
@ -275,6 +270,7 @@ ftgl:arm-uwp=fail
functions-framework-cpp:x64-uwp=fail
gazebo:x64-linux=fail
gdk-pixbuf:x64-windows-static=fail
# gsoap does not offer stable public source downloads
gsoap:x64-windows = skip
gsoap:x86-windows = skip
@ -306,17 +302,18 @@ gherkin-c:x86-windows = skip
glew:arm64-windows=fail
glfw3:arm-uwp=fail
glfw3:x64-uwp=fail
glib:x64-uwp=fail
glib:x64-windows-static=fail
gmmlib:arm64-windows=fail
glibmm:x64-windows-static-md=fail
glibmm:x64-windows-static=fail
gmmlib:arm-uwp=fail
gmmlib:arm64-windows=fail
gmmlib:x64-osx=fail
gmmlib:x64-uwp=fail
gmmlib:x64-windows=fail
gmmlib:x64-windows-static=fail
gmmlib:x64-windows-static-md=fail
gmmlib:x64-windows-static=fail
gmmlib:x64-windows=fail
gmmlib:x86-windows=fail
gstreamer:x64-windows-static=fail
gstreamer:x64-windows-static-md=fail
google-cloud-cpp:arm-uwp=fail
google-cloud-cpp:x64-uwp=fail
gperftools:arm64-windows=fail
@ -392,6 +389,8 @@ kfr:arm-uwp=fail
kfr:x64-linux=fail
lastools:arm-uwp=fail
lastools:x64-uwp=fail
lcm:x64-windows-static=fail
lcm:x64-windows-static-md=fail
leptonica:x64-uwp=fail
leptonica:arm-uwp=fail
leveldb:arm-uwp=fail
@ -423,11 +422,11 @@ libgit2:x64-uwp=fail
libgo:arm-uwp=fail
libgo:x64-uwp=fail
libgo:arm64-windows=fail
# the msbuild for libgpg:x64-uwp and libgpg-error:x64-uwp are broken on VS2022 due to TargetPlatformMinVersion not existing
libgpg:x64-uwp=fail
libgpg-error:x64-uwp=fail
libgxps:x64-windows-static=fail
libgxps:x64-windows-static-md=fail
libhdfs3:x64-linux=fail
libhdfs3:x64-osx=fail
libhdfs3:arm64-osx=fail
@ -503,25 +502,15 @@ libqcow:x64-linux=skip
libqcow:x86-windows=skip
libqcow:arm64-windows=skip
# Conflicts with openssl
boringssl:arm64-windows = skip
boringssl:arm-uwp = skip
boringssl:x64-linux = skip
boringssl:x64-osx = skip
boringssl:arm64-osx = skip
boringssl:x64-uwp = skip
boringssl:x64-windows = skip
boringssl:x64-windows-static = skip
boringssl:x64-windows-static-md=skip
boringssl:x86-windows = skip
libressl:arm64-windows = skip
libressl:arm-uwp = skip
libressl:x64-linux = skip
libressl:x64-osx = skip
libressl:x64-uwp = skip
libressl:x64-windows = skip
libressl:x64-windows-static = skip
libressl:arm64-windows=skip
libressl:arm-uwp=skip
libressl:x64-linux=skip
libressl:x64-osx=skip
libressl:x64-uwp=skip
libressl:x64-windows=skip
libressl:x64-windows-static=skip
libressl:x64-windows-static-md=skip
libressl:x86-windows = skip
libressl:x86-windows=skip
libsoundio:arm64-windows=fail
libsoundio:arm-uwp=fail
libsoundio:x64-uwp=fail
@ -615,6 +604,9 @@ mesa:x64-windows-static=fail
# Missing dependent libraries.
mesa:x64-linux=fail
mesa:x64-osx=fail
# Triggers an ICE
mfl:x64-windows-static=fail
mfl:x64-windows-static-md=fail
mfl:x64-linux=skip
mfl:x64-osx=skip
mfl:arm64-osx=skip
@ -808,6 +800,7 @@ openmesh:arm-uwp=fail
openmesh:x64-uwp=fail
openni2:x64-uwp=fail
openni2:x64-windows-static=fail
openscap:x64-windows-static=fail
openscap:x64-osx=fail
openvpn3:x64-osx=fail
openvr:arm64-windows=fail

2
versions/baseline.json
View File

@ -2590,7 +2590,7 @@
},
"glib": {
"baseline": "2.72.3",
"port-version": 1
"port-version": 2
},
"glibmm": {
"baseline": "2.70.0",

5
versions/g-/glib.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "aed4b2abc6c22c9b49d18ad5ab5d3f12cb330d22",
"version": "2.72.3",
"port-version": 2
},
{
"git-tree": "5d5171b8b2d18d7a24e54d5a062aa18b5effb3f4",
"version": "2.72.3",