[glib] fix x64-mingw-dynamic build #28207
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JonLiu1993
added
the
category:community-triplet
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.
error: checked-in files for glib have changed but the version was not updated
version: 2.74.1
old SHA: 62e6236281de8dd6bd983d4d51721374e5559c7c
new SHA: f6af7ed0f1f18ed22bd9a982039e33a5d918f009
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
|
@kvnp, thanks for your PR, please add |
dg0yt
suggested changes
Dec 7, 2022
|
@microsoft-github-policy-service agree |
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout d7c68eea3888e285e4e51b028c13efa1c5229029 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index d9029e1..5e5272d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2657,8 +2657,8 @@
"port-version": 0
},
"glib": {
- "baseline": "2.74.1",
- "port-version": 0
+ "baseline": "2.74.2",
+ "port-version": 1
},
"glibmm": {
"baseline": "2.74.0",
@@ -7228,7 +7228,7 @@
"baseline": "0.9.3",
"port-version": 0
},
- "sse2neon" : {
+ "sse2neon": {
"baseline": "1.5.1",
"port-version": 0
},
diff --git a/versions/g-/glib.json b/versions/g-/glib.json
index 5b1601f..36f51a7 100644
--- a/versions/g-/glib.json
+++ b/versions/g-/glib.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "525b96454cdefe2f4f9bf5f8fcfffb5140ddc70c",
+ "version": "2.74.2",
+ "port-version": 1
+ },
{
"git-tree": "62e6236281de8dd6bd983d4d51721374e5559c7c",
"version": "2.74.1",
dg0yt
suggested changes
Dec 8, 2022
There was a problem hiding this comment.
Actually we don't need anything from msys for building this port and could just patch the condition in tools/meson.build (if have_sh -> if true).
OTOH the msys packages are already needed to build dependency gettext, so it is acceptable for me to avoid the patch.
kvnp
force-pushed
the
patch-1
branch
2 times, most recently
from
cb27497
to
135a5b8
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 30a20e8f15ff26eec665205dea52f4ffc6f0814b -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 8ca99b6..7d948c0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2658,7 +2658,7 @@
},
"glib": {
"baseline": "2.74.1",
- "port-version": 0
+ "port-version": 1
},
"glibmm": {
"baseline": "2.74.0",
diff --git a/versions/g-/glib.json b/versions/g-/glib.json
index 5b1601f..6a49a2e 100644
--- a/versions/g-/glib.json
+++ b/versions/g-/glib.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "88e0fcaecf90be537bfb5fba27a7c66dedc26101",
+ "version": "2.74.1",
+ "port-version": 1
+ },
{
"git-tree": "62e6236281de8dd6bd983d4d51721374e5559c7c",
"version": "2.74.1",
|
Please run command "./vcpkg x-add-version glib --overwrite-version" and commit again. |
|
So now I have the solution I was looking for: diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake
index 4c7d6d406..ba4f4c288 100644
--- a/ports/glib/portfile.cmake
+++ b/ports/glib/portfile.cmake
@@ -34,8 +34,17 @@ if(VCPKG_TARGET_IS_WINDOWS)
list(APPEND OPTIONS -Diconv=external)
endif()
+vcpkg_list(SET ADDITIONAL_BINARIES)
+if(VCPKG_HOST_IS_WINDOWS)
+ # Presence of bash and sh enables installation of auxiliary components.
+ vcpkg_list(APPEND ADDITIONAL_BINARIES "bash = ['${CMAKE_COMMAND}', '-E', 'false']")
+ vcpkg_list(APPEND ADDITIONAL_BINARIES "sh = ['${CMAKE_COMMAND}', '-E', 'false']")
+endif()
+
vcpkg_configure_meson(
SOURCE_PATH "${SOURCE_PATH}"
+ ADDITIONAL_BINARIES
+ ${ADDITIONAL_BINARIES}
OPTIONS
${OPTIONS}
-Dgtk_doc=false |
That's an interesting feature of CMake I didn't know existed! |
|
@kvnp, please fix the conflict files. |
|
@kvnp There was a glib update so you have to merge master, or rebase on top of it. |
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.
error: checked-in files for glib have changed but the version was not updated
version: 2.75.0#1
old SHA: 1091ca68702ae57c419fe13fd87ec3a5c8ee0a2a
new SHA: 1797b3e9ec1e29b18f0ba26306e5220e3c7a05bf
Did you remember to update the version or port version?
Use --overwrite-version to bypass this check
***No files were updated***
|
This is error log, please take a look: |
|
Pinging @kvnp for response. Is work still being done for this PR? |
This error shouldn't have occurred since this PR has no effect on Unix based environments. I would suggest to rerun the pipeline. Unfortunately, I don't have an OSX machine for further troubleshooting. |
You can send your modification plan. I will test it locally and provide you with feedback results. I have OSX machines. |
|
Pinging @kvnp for response. Is work still being done for this PR? |
Does glib still build on OSX without the change in this PR? |
|
Pushed some experimental commits just to rule out that setting additional binaries is the cause for the build failure on OSX. I hope it works this time. |
dg0yt
suggested changes
Mar 19, 2023
kvnp
force-pushed
the
patch-1
branch
3 times, most recently
from
b7aefb8
to
9146de7
Compare
|
@kvnp, Please run command |
JonLiu1993
approved these changes
Mar 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Building glib on x64-mingw-dynamic fails with the following error:
gcc -v
The portfile currently assumes that the executable glib-gettextize is built when using mingw which is not the case. Removing it from the loop for all windows builds fixes it.
Describe the pull request
What does your PR fix?
Fixes #...
Which triplets are supported/not supported? Have you updated the CI baseline?
<all / linux, windows, ...>, <Yes/No>
Does your PR follow the maintainer guide?
Your answerIf you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?<Yes / I am still working on this PR>
If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/