Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libb2] Add supports and install pkg-conifg on macOS VM #12398

Merged
merged 4 commits into from
Jul 14, 2020
Merged

[libb2] Add supports and install pkg-conifg on macOS VM #12398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0eb4de4
[libb2] Add supports and install pkg-conifg on macOS VM
PhoebeHui Jul 13, 2020
88e3c69
Add blank line to the end of the json file
PhoebeHui Jul 13, 2020
3f830af
vcpkg x-format-manifest --all
PhoebeHui Jul 13, 2020
ef840cf
Remove failed ports in ci baseline file
PhoebeHui Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions ports/libb2/CONTROL
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ports/libb2/portfile.cmake
View file
Open in desktop
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
View file
Open in desktop
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"
PhoebeHui marked this conversation as resolved.
Show resolved Hide resolved
}
1 change: 1 addition & 0 deletions scripts/azure-pipelines/osx/azure-pipelines.yml
View file
Open in desktop
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
View file
Open in desktop
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