diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-07-14 23:37:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 08:37:14 -0700 |
| commit | 9891a8f2132aa18cdc6f96862ee5406f2d901b0e (patch) | |
| tree | 3871d602b85c9e4252d8f4a378d0f2c1da1f309e | |
| parent | f38a61de33631b1d0cfbc110a62558dac63459ab (diff) | |
| download | vcpkg-9891a8f2132aa18cdc6f96862ee5406f2d901b0e.tar.gz vcpkg-9891a8f2132aa18cdc6f96862ee5406f2d901b0e.zip | |
[libb2] Add supports and install pkg-conifg on macOS VM (#12398)
* [libb2] Add supports and install pkg-conifg on macOS VM
* Add blank line to the end of the json file
* vcpkg x-format-manifest --all
* Remove failed ports in ci baseline file
| -rw-r--r-- | ports/libb2/CONTROL | 4 | ||||
| -rw-r--r-- | ports/libb2/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/libb2/vcpkg.json | 8 | ||||
| -rw-r--r-- | scripts/azure-pipelines/osx/azure-pipelines.yml | 1 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 6 |
5 files changed, 11 insertions, 11 deletions
diff --git a/ports/libb2/CONTROL b/ports/libb2/CONTROL deleted file mode 100644 index c905e1204..000000000 --- a/ports/libb2/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: libb2 -Version: 0.98.1-2 -Homepage: https://github.com/BLAKE2/libb2 -Description: C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp
\ No newline at end of file diff --git a/ports/libb2/portfile.cmake b/ports/libb2/portfile.cmake index 2a342f9dc..2401cf0c1 100644 --- a/ports/libb2/portfile.cmake +++ b/ports/libb2/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_TARGET "WINDOWS") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO BLAKE2/libb2 @@ -23,5 +25,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() -# Handle copyright file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file diff --git a/ports/libb2/vcpkg.json b/ports/libb2/vcpkg.json new file mode 100644 index 000000000..1d2f19db8 --- /dev/null +++ b/ports/libb2/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "libb2", + "version-string": "0.98.1", + "port-version": 3, + "description": "C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp", + "homepage": "https://github.com/BLAKE2/libb2", + "supports": "!windows" +} diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml index f90cc5c30..cbf401fd3 100644 --- a/scripts/azure-pipelines/osx/azure-pipelines.yml +++ b/scripts/azure-pipelines/osx/azure-pipelines.yml @@ -18,6 +18,7 @@ jobs: - bash: |
brew list autoconf || brew install autoconf
brew list automake || brew install automake
+ brew list pkg-config || brew install pkg-config
brew list libtool || brew install libtool
brew list bison || brew install bison
brew list gfortran || brew cask install gfortran
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index ddf34f5c6..5546c1f1a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -653,12 +653,6 @@ leveldb:x64-uwp=fail libaiff:x64-linux=fail libarchive:arm-uwp=fail libass:x64-windows-static=fail -libb2:x86-windows=fail -libb2:x64-windows=fail -libb2:x64-windows-static=fail -libb2:x64-uwp=fail -libb2:arm64-windows=fail -libb2:arm-uwp=fail libbf:arm64-windows=fail libbf:arm-uwp=fail libbf:x64-uwp=fail |