diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-05-06 16:32:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-06 07:32:53 -0700 |
| commit | b93b4c4ef07747c3f3a9448ded46fab8fcbc00b4 (patch) | |
| tree | f66b9c29e9fbf2b73f432b138d8ec54d6f508ffb | |
| parent | 00b0e7878a26afb84d1bcc581f529b1b985f19d2 (diff) | |
| download | vcpkg-b93b4c4ef07747c3f3a9448ded46fab8fcbc00b4.tar.gz vcpkg-b93b4c4ef07747c3f3a9448ded46fab8fcbc00b4.zip | |
[tool-meson] update to 0.58 (#17631)
* update meson to latest
* version stuff
* update meson to 0.58
* reset version stuff
* version stuff
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
| -rw-r--r-- | ports/tool-meson/CONTROL | 4 | ||||
| -rw-r--r-- | ports/tool-meson/vcpkg.json | 6 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 11 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/t-/tool-meson.json | 5 |
5 files changed, 18 insertions, 10 deletions
diff --git a/ports/tool-meson/CONTROL b/ports/tool-meson/CONTROL deleted file mode 100644 index 2c817f247..000000000 --- a/ports/tool-meson/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: tool-meson -Version: 0.56.02 -Homepage: https://github.com/mesonbuild/meson -Description: Meson build system diff --git a/ports/tool-meson/vcpkg.json b/ports/tool-meson/vcpkg.json new file mode 100644 index 000000000..4f69be22b --- /dev/null +++ b/ports/tool-meson/vcpkg.json @@ -0,0 +1,6 @@ +{ + "name": "tool-meson", + "version": "0.58.0", + "description": "Meson build system", + "homepage": "https://github.com/mesonbuild/meson" +} diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 36bbc6e24..aea148e45 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -250,19 +250,20 @@ function(vcpkg_find_acquire_program VAR) set(NOEXTRACT ON) set(HASH 22ea847d8017cd977664d0b13c889cfb13c89143212899a511be217345a4e243d4d8d4099700114a11d26a087e83eb1a3e2b03bdb5e0db48f10403184cd26619) elseif(VAR MATCHES "MESON") - set(MESON_VERSION 0.56.01) + set(MESON_VERSION 0.58.0) set(PROGNAME meson) set(REQUIRED_INTERPRETER PYTHON3) set(APT_PACKAGE_NAME "meson") set(BREW_PACKAGE_NAME "meson") set(SCRIPTNAME meson meson.py) - set(PATHS ${DOWNLOADS}/tools/meson/meson-f5871f434a5b768ad9fcafa797a6db0286421842) - set(URL "https://github.com/mesonbuild/meson/archive/f5871f434a5b768ad9fcafa797a6db0286421842.tar.gz") - set(ARCHIVE "meson-f5871f434a5b768ad9fcafa797a6db0286421842.tar.gz") + set(REF 753954be868ed78b3e339e8811fd1d29eb2af237) + set(PATHS ${DOWNLOADS}/tools/meson/meson-${REF}) + set(URL "https://github.com/mesonbuild/meson/archive/${REF}.tar.gz") + set(ARCHIVE "meson-${REF}.tar.gz") #set(PATHS ${DOWNLOADS}/tools/meson/meson-${MESON_VERSION}) #set(URL "https://github.com/mesonbuild/meson/releases/download/${MESON_VERSION}/meson-${MESON_VERSION}.tar.gz") #set(ARCHIVE "meson-${MESON_VERSION}.tar.gz") - set(HASH e8c36166b673acfccda54dcdbbc2414c9d0ce018debcdf6a09418f2f240edf14e72725188fe7ff7a3fcdc3942e8d1393e08a28d6f1bded4610f3ab836ab8e254) + set(HASH 1e5b5ac216cb41af40b3e72240f3cb319772a02aaea39f672085aafb41c3c732c932c9d0c4e8deb5b4b1ec1112860e6a3ddad59898bebbd165ed7876c87728b3) set(_vfa_SUPPORTED ON) set(VERSION_CMD --version) elseif(VAR MATCHES "FLEX" OR VAR MATCHES "BISON") diff --git a/versions/baseline.json b/versions/baseline.json index f05ef8da8..b2463bb44 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6129,7 +6129,7 @@ "port-version": 1 }, "tool-meson": { - "baseline": "0.56.02", + "baseline": "0.58.0", "port-version": 0 }, "torch-th": { diff --git a/versions/t-/tool-meson.json b/versions/t-/tool-meson.json index f340d2836..d1ba120ae 100644 --- a/versions/t-/tool-meson.json +++ b/versions/t-/tool-meson.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "3abddc8b29ae6e5c0265237a8c3f3e8ec8348710", + "version": "0.58.0", + "port-version": 0 + }, + { "git-tree": "3e9b57e374c062aa7a2b863b4c6a5d4e971da7c1", "version-string": "0.56.02", "port-version": 0 |