diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-09-29 18:03:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 18:03:18 -0700 |
| commit | bba6b96de18482e118ee1b8883a195a232e2fdef (patch) | |
| tree | 7a5c0da7c79ba807e74e437e17d7906035f6a238 /versions | |
| parent | 45315bc3aaa0e718337eed13e6f6ae4e41bae04b (diff) | |
| download | vcpkg-bba6b96de18482e118ee1b8883a195a232e2fdef.tar.gz vcpkg-bba6b96de18482e118ee1b8883a195a232e2fdef.zip | |
Build fixes from 2021-09-28's nightly build. (#20435)
https://dev.azure.com/vcpkg/public/_build/results?buildId=60445
PASSING, REMOVE FROM FAIL LIST: soundtouch:x64-windows-static
Probably fixed by: https://github.com/microsoft/vcpkg/pull/19377
REGRESSION: mosquitto:x86-windows
REGRESSION: mosquitto:x64-windows
Probably broken by: https://github.com/microsoft/vcpkg/pull/20148/
```
The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets.
D:/packages/mosquitto_x86-windows/bin/mosquitto_ctrl.exe
The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets.
D:/packages/mosquitto_x86-windows/debug/bin/mosquitto_ctrl.exe
Found 2 error(s). Please correct the portfile:
C:\a\1\s\ports\mosquitto\portfile.cmake
-- Performing post-build validation done
```
The upstream build system has this:
```
option(WITH_CJSON "Build with cJSON support (required for dynamic security plugin and useful for mosquitto_sub)?" ON)
if (WITH_CJSON)
FIND_PACKAGE(cJSON)
if (CJSON_FOUND)
message(STATUS ${CJSON_FOUND})
else (CJSON_FOUND)
message(STATUS "Optional dependency cJSON not found. Some features will be disabled.")
endif(CJSON_FOUND)
endif()
```
and indeed, I repro the problem if cjson is installed first. Disable WITH_CJSON as a fix.
OSX never finishing: Hopefully fixed by https://github.com/microsoft/vcpkg/pull/20388
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/m-/mosquitto.json | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 854de77eb..661c07e67 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4362,7 +4362,7 @@ }, "mosquitto": { "baseline": "2.0.12", - "port-version": 0 + "port-version": 1 }, "mozjpeg": { "baseline": "2021-09-27", diff --git a/versions/m-/mosquitto.json b/versions/m-/mosquitto.json index 5572dcfdc..0fe4043f1 100644 --- a/versions/m-/mosquitto.json +++ b/versions/m-/mosquitto.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ef8ae230660456d039888e201ea521f58caf0951", + "version": "2.0.12", + "port-version": 1 + }, + { "git-tree": "90a1a4314b15a787186d515df048f77961a4c7f3", "version": "2.0.12", "port-version": 0 |