Commit Graph

7 Commits

Author SHA1 Message Date
georg-emg
ddfcc232b4
[mosquitto] fixed building of static libraries (#21131)
* - updated catch2 to version 2.13.5
- replaced CONTROL file with proper manifest

* vcpkg x-add-version catch2

* removed a file added to the wrong branch

* [mosquitto] fixed building of static libraries

* vcpkg x-add-version mosquitto
2021-11-09 13:40:47 -08:00
autoantwort
e7e328cf9d
[many ports] call vcpkg_fixup_pkgconfig() (#20953)
* [many ports] call vcpkg_fixup_pkgconfig()

The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files

* Update port-version for armadillo and polyclipping.

* Update version database.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-10-27 15:19:28 -07:00
Billy O'Neal
bba6b96de1
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
2021-09-29 18:03:18 -07:00
Antoine Hoarau
5aec72b4f3
[mosquitto] Update to 2.0.12 (#20148)
* update mosquitto to 2.0.12

* update json

* Update ports/mosquitto/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update ports/libwebsockets/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* add head ref

* remove plugins

* update jsons

* update libwebsockets

* Update versions/m-/mosquitto.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update versions/l-/libwebsockets.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update ports/mosquitto/portfile.cmake

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* update version

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
2021-09-27 17:51:07 -07:00
nicole mazzuca
4cbbcbddfd
[vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (#13619)
* [vcpkg ci:osx] Remove brew install

* add instructions for creating a new vagrant box

* fix the vagrant scripts for the new box

* finish fixing the setup

* [mecab jxrlib] fix ports for CI

mecab needed to use an actual ref that wasn't master,
and jxrlib needed a patch for xcode 12 CLTs.

Additionally, this fixes the mecab version to be a date, the date of the last commit,
since `1.0` is not the correct version (mecab doesn't have released versions)

* [many ports] fix compile with Xcode 12 CLTs

This mostly means fixing errors on implicit-function-declaration,
and removing some Werrors
* alac-decoder
* apr
* argtable2
* arrow
* hyperscan
* mcpp
* minizip
* mosquitto
* stormlib

* [many ports] even more Xcode 12 CLT fixes

* [jxrlib darknet] fix the last ports! (hopefully)

* CRs, plus minor wip changes to osx scripts
2020-09-24 15:15:06 -07:00
nicole mazzuca
1c2af99415
[vcpkg format-manifest] Add convert-control flag (#12471)
* [vcpkg format-manifest] initial convert-control attempt

TODO: manifest comments! we should keep $directives

* Finalize x-format-manifest

First, fix Json::parse -- "\c", for any c, was incorrectly parsed.
It would emit the escaped character, and then parse the character, so
that `\b` would give you { '\b', 'b' }.

Second, canonicalize source paragraphs as we're parsing them. This found
an error in qt5 -- The `declarative` feature was listed twice, and we
now catch it, so I removed the second paragraph.

Add PlatformExpression::complexity to allow ordering platform
expressions in a somewhat reasonable way.

Notes:
  - We allow `all_modules` as a feature name for back-compat with
    paraview
  - In order to actually convert CONTROL to vcpkg.json, we'd need to
    rename the qt5 `default` feature.
  - We need to add support for $directives in x-format-manifest

* fix qt5 port

* format

* fix compile

* fix tests for canonicalization

* Clean up code

* add error message for nothing to format

* add extra_info field

* add `const X&` overloads for `Object::insert[_or_replace]`

* fix compile

* simple CRs

* add tests

* format

* Fix mosquitto port file

also unmerge a line

* fail the tests on malformed manifest

* fix format_all

* fix coroutine port-version

* format manifests
2020-08-02 10:08:07 -07:00
Lily
103939fa9b
[mosquitto] Add vcpkg-cmake-wrapper.cmake and vcpkg.json (#12536) 2020-07-31 11:35:46 -07:00