-
Notifications
You must be signed in to change notification settings - Fork 6.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[boost-modular-build-helper] Attempt to pass flags more correctly into b2 #23001
Conversation
d944b13
to
d722fff
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: Local changes detected for boost-modular-build-helper but no changes to version or port version.
-- Version: 1.78.0#2
-- Old SHA: 9400b3bfdc93a165b3b509a76c59107c020113a6
-- New SHA: f5071551137953297ec6d58d12bac7c5a00205c8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: Local changes detected for boost-modular-build-helper but no changes to version or port version.
-- Version: 1.78.0#2
-- Old SHA: 9400b3bfdc93a165b3b509a76c59107c020113a6
-- New SHA: f5071551137953297ec6d58d12bac7c5a00205c8
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
string(APPEND CXXFLAGS " <compileflags>\"${libpath_arg}\" <cxxflags>/ZW <compileflags>\"/D_WIN32_WINNT=0x0A00\"") | ||
string(APPEND CFLAGS " <cflags>-Zl") | ||
string(APPEND CXXFLAGS " /ZW") | ||
string(APPEND COMPILEFLAGS " ${libpath_arg} /D_WIN32_WINNT=0x0A00") | ||
string(APPEND CFLAGS " -Zl") | ||
list(APPEND B2_OPTIONS windows-api=store) | ||
list(APPEND B2_OPTIONS linkflags=WindowsApp.lib) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this would partly conflict with the uwp settings in #22831
Have I said that even outlook has problems with usernames containing spaces? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: Local changes detected for ffmpeg but no changes to version or port version.
-- Version: 4.4.1#8
-- Old SHA: 03b7a2329bc927de9637d45738c23e607e4f4387
-- New SHA: 01a49f27efac32fb86b3381353ae365a442911c5
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: 6f18f91ec5a38e8fbc9266993055cbf57a226d63
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-qmake but no changes to version or port version.
-- Version: 2021-10-23
-- Old SHA: 1b1cd1cfcca489897822287c15af473fa4380cb1
-- New SHA: 4df08ac2a801250f2e7c6bdea23c21600e9a765b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout cef0e8a8c7e5493283f2895c9c6fd8431d166b43 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index e45e0fb..009760d 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "6ec70423606d92d7c5778e96b30cd2e8a8c572fa",
+ "version": "1.78.0",
+ "port-version": 3
+ },
{
"git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6",
"version": "1.78.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 85e73d1..e7b916c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -822,7 +822,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.78.0",
- "port-version": 2
+ "port-version": 3
},
"boost-move": {
"baseline": "1.78.0",
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: Local changes detected for ffmpeg but no changes to version or port version.
-- Version: 4.4.1#8
-- Old SHA: 03b7a2329bc927de9637d45738c23e607e4f4387
-- New SHA: 01a49f27efac32fb86b3381353ae365a442911c5
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: dd313fd2fa062b95a4122479ad5a75471a4705ca
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-qmake but no changes to version or port version.
-- Version: 2021-10-23
-- Old SHA: 1b1cd1cfcca489897822287c15af473fa4380cb1
-- New SHA: 4df08ac2a801250f2e7c6bdea23c21600e9a765b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout cef0e8a8c7e5493283f2895c9c6fd8431d166b43 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index e45e0fb..f241ef2 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "3228b78ef41e18cdc4b8ffe7aa9fc02ca7c8e208",
+ "version": "1.78.0",
+ "port-version": 3
+ },
{
"git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6",
"version": "1.78.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 85e73d1..e7b916c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -822,7 +822,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.78.0",
- "port-version": 2
+ "port-version": 3
},
"boost-move": {
"baseline": "1.78.0",
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: Local changes detected for ffmpeg but no changes to version or port version.
-- Version: 4.4.1#8
-- Old SHA: 03b7a2329bc927de9637d45738c23e607e4f4387
-- New SHA: 01a49f27efac32fb86b3381353ae365a442911c5
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: dd313fd2fa062b95a4122479ad5a75471a4705ca
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-qmake but no changes to version or port version.
-- Version: 2021-10-23
-- Old SHA: 1b1cd1cfcca489897822287c15af473fa4380cb1
-- New SHA: 4df08ac2a801250f2e7c6bdea23c21600e9a765b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout cef0e8a8c7e5493283f2895c9c6fd8431d166b43 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index e45e0fb..fe9a727 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "68a9a82d6b1b7a2040ceb1dd4459aa4423846813",
+ "version": "1.78.0",
+ "port-version": 3
+ },
{
"git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6",
"version": "1.78.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 85e73d1..e7b916c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -822,7 +822,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.78.0",
- "port-version": 2
+ "port-version": 3
},
"boost-move": {
"baseline": "1.78.0",
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: Local changes detected for ffmpeg but no changes to version or port version.
-- Version: 4.4.1#8
-- Old SHA: 03b7a2329bc927de9637d45738c23e607e4f4387
-- New SHA: 01a49f27efac32fb86b3381353ae365a442911c5
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: dd313fd2fa062b95a4122479ad5a75471a4705ca
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-qmake but no changes to version or port version.
-- Version: 2021-10-23
-- Old SHA: 1b1cd1cfcca489897822287c15af473fa4380cb1
-- New SHA: 4df08ac2a801250f2e7c6bdea23c21600e9a765b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout cef0e8a8c7e5493283f2895c9c6fd8431d166b43 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index e45e0fb..00fffbe 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "a9c7c402ef134b2e4c6dc1961832d645f9827a2d",
+ "version": "1.78.0",
+ "port-version": 3
+ },
{
"git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6",
"version": "1.78.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4058e15..1d53232 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -822,7 +822,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.78.0",
- "port-version": 2
+ "port-version": 3
},
"boost-move": {
"baseline": "1.78.0",
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
Valid values for the license field can be found in the documentation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: Local changes detected for ffmpeg but no changes to version or port version.
-- Version: 4.4.1#8
-- Old SHA: 03b7a2329bc927de9637d45738c23e607e4f4387
-- New SHA: 2e6103d7bec716a5691b82663dec4bf300eda84a
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-01-19
-- Old SHA: b7c050fe60f91dcedef6d87a3f87584151bf8aee
-- New SHA: dd313fd2fa062b95a4122479ad5a75471a4705ca
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
Error: Local changes detected for vcpkg-qmake but no changes to version or port version.
-- Version: 2021-10-23
-- Old SHA: 1b1cd1cfcca489897822287c15af473fa4380cb1
-- New SHA: 4df08ac2a801250f2e7c6bdea23c21600e9a765b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout cef0e8a8c7e5493283f2895c9c6fd8431d166b43 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
index e45e0fb..00fffbe 100644
--- a/versions/b-/boost-modular-build-helper.json
+++ b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "a9c7c402ef134b2e4c6dc1961832d645f9827a2d",
+ "version": "1.78.0",
+ "port-version": 3
+ },
{
"git-tree": "9400b3bfdc93a165b3b509a76c59107c020113a6",
"version": "1.78.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 4058e15..1d53232 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -822,7 +822,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.78.0",
- "port-version": 2
+ "port-version": 3
},
"boost-move": {
"baseline": "1.78.0",
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
Valid values for the license field can be found in the documentation
|
252cba6
to
7fd7b65
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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: Local changes detected for vcpkg-qmake but no changes to version or port version.
-- Version: 2021-10-23
-- Old SHA: 1b1cd1cfcca489897822287c15af473fa4380cb1
-- New SHA: 4df08ac2a801250f2e7c6bdea23c21600e9a765b
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/vcpkg-cmake/vcpkg.json
Valid values for the license field can be found in the documentation
7fd7b65
to
aff68db
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/vcpkg-cmake/vcpkg.json
ports/vcpkg-qmake/vcpkg.json
Valid values for the license field can be found in the documentation
aff68db
to
e323436
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/vcpkg-cmake/vcpkg.json
ports/vcpkg-qmake/vcpkg.json
Valid values for the license field can be found in the documentation
e323436
to
813b207
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You have modified or added at least one vcpkg.json where a "license" field is missing.
If you feel able to do so, please consider adding a "license" field to the following files:
ports/boost-modular-build-helper/vcpkg.json
ports/ffmpeg/vcpkg.json
ports/vcpkg-cmake/vcpkg.json
ports/vcpkg-qmake/vcpkg.json
Valid values for the license field can be found in the documentation
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
@dan-shaw, could you help merge this PR firstly? |
@vicroms, could you please help merge this PR? it also blocks internal users. |
@ras0219-msft With this change merged, |
@@ -23,13 +26,13 @@ else() | |||
list(APPEND B2_OPTIONS link=static) | |||
endif() | |||
|
|||
if(CMAKE_SIZEOF_VOID_P EQUAL 8) | |||
if(VCPKG_DETECTED_CMAKE_SIZEOF_VOID_P EQUAL "8") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This variable is not set. (And why no longer CMAKE_SIZEOF_VOID_P
)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Anwer to the question: No languages enabled here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This variable is not set.
... because I didn't update vcpkg-cmake
at the same time.
Why can't we use version>=
for such dependencies?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why can't we use version>= for such dependencies?
manifest mode would have automatically reinstalled here. Just always start from scratch if you use classic mode and do git operations.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
manifest mode would have automatically reinstalled here.
... unless I (the user) would pin a different version. That's why I think it is useful to make the versioned dependencies explicit.
Hi, A check should be added when |
This PR attempts to address #22477, #20697, #22840, and #22371 via #22371 (comment).
As part of this, I've changed the precise return values of
vcpkg_cmake_get_vars()
. Instead of the previous approach which extracted some CMake values raw and some values semi-composited, I've instead taken the structured approach of:VCPKG_DETECTED_<VAR>
. Generally, these should not need to be used by consumers.VCPKG_COMBINED_<LANG>_FLAGS_<CONFIG>
. This is important to ensure consumers are completely decoupled from specific CMake implementation details, like common vs config-specific flags or CMake flags that aren't kept in the normalCMAKE_<LANG>_FLAGS
variable and are instead added during the rule processing phase.