Skip to content

Commit

Permalink
[libb2] Add supports and install pkg-conifg on macOS VM (microsoft#12398
Browse files Browse the repository at this point in the history
)

* [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
  • Loading branch information
PhoebeHui authored Jul 14, 2020
1 parent f38a61d commit 9891a8f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 0 additions & 4 deletions ports/libb2/CONTROL

This file was deleted.

3 changes: 2 additions & 1 deletion ports/libb2/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
vcpkg_fail_port_install(ON_TARGET "WINDOWS")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO BLAKE2/libb2
Expand All @@ -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)
8 changes: 8 additions & 0 deletions ports/libb2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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"
}
1 change: 1 addition & 0 deletions scripts/azure-pipelines/osx/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9891a8f

Please sign in to comment.