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

[blake3] Update port to use official buildsystem #31602

Merged
merged 6 commits into from
May 25, 2023
Merged

[blake3] Update port to use official buildsystem #31602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
632e3df
[blake3] Update port to use official buildsystem
BurningEnlightenment May 24, 2023
a7545dd
[blake3] Add version to database
BurningEnlightenment May 24, 2023
ea3b76f
[blake3] Force correct filenames
BurningEnlightenment May 24, 2023
0a6ab54
[blake3] Add version to database
BurningEnlightenment May 24, 2023
a57f1d6
[blake3] Backport DSO/DLL support
BurningEnlightenment May 24, 2023
d889623
[blake3] Add version to database
BurningEnlightenment May 24, 2023
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
65 changes: 0 additions & 65 deletions ports/blake3/CMakeLists.txt
View file
Open in desktop

This file was deleted.

39 changes: 34 additions & 5 deletions ports/blake3/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,49 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO BLAKE3-team/BLAKE3
REF 1.3.3
REF "${VERSION}"
SHA512 3ea57a86af7357582479ed5d762d368ee52421636c72723b08f528f9bf53637bad0058c5aded0b9a1b9479f374f5d3b110677e00c2b1124a47bfcdac800c2836
HEAD_REF main
)

file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
# these four files are included in the next release
vcpkg_download_distfile(
CMAKELISTS_SOURCE_PATH
URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/CMakeLists.txt
FILENAME blake3-CMakeLists.txt
SHA512 598699b90053fdbe381843f886c213f5e6d03281a9b8c1403726c300e83a9da353879da7170637024663af576e54f74a307049577360ded90d25e11bd852edde
)
vcpkg_download_distfile(
CMAKECONFIGIN_SOURCE_PATH
URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3-config.cmake.in
FILENAME blake3-config.cmake.in
SHA512 f9bdb41bd4e4930ab31624f484f895fbda57066a4b3e0a38e7ffefab7343779d1c356fbaf6231643fd069f7a176b840f234f74d9f9ee4167cc430d7bfec0f40f
)
vcpkg_download_distfile(
PKGCONFIGIN_SOURCE_PATH
URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/libblake3.pc.in
FILENAME libblake3.pc.in
SHA512 cfbaea63368e655c3ac3357f791b6332ae0241f3fd4f98e19c48f28e633e25a5b1125d1cc6b4815edfd013a76379dffcf9723852a7b76f2910d19dc77e538fa2
)
vcpkg_download_distfile( # we need the dllexport macro (otherwise these files are identical)
BLAKE3_H_SOURCE_PATH
URLS https://raw.githubusercontent.com/BLAKE3-team/BLAKE3/76f9339312e1d52632a1cfb9df285c01911d99ce/c/blake3.h
FILENAME blake3.h
SHA512 0f9852ff0e527e8fe0d567408c5c100ee3707a1b942ac1fbd78208a68ecfd32814729b5082720278d25d4cf45eb1020fcf3e4199cab0a67a6ca6af4321bcbc3e
)
file(COPY_FILE "${CMAKELISTS_SOURCE_PATH}" "${SOURCE_PATH}/c/CMakeLists.txt")
file(COPY_FILE "${CMAKECONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3-config.cmake.in")
file(COPY_FILE "${PKGCONFIGIN_SOURCE_PATH}" "${SOURCE_PATH}/c/libblake3.pc.in")
file(COPY_FILE "${BLAKE3_H_SOURCE_PATH}" "${SOURCE_PATH}/c/blake3.h")

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
SOURCE_PATH "${SOURCE_PATH}/c"
)

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
vcpkg_fixup_pkgconfig()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
5 changes: 5 additions & 0 deletions ports/blake3/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
{
"name": "blake3",
"version": "1.3.3",
"port-version": 1,
"description": "BLAKE3 cryptographic hash function.",
"homepage": "https://github.com/BLAKE3-team/BLAKE3",
"license": "CC0-1.0 OR Apache-2.0",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
5 changes: 5 additions & 0 deletions versions/b-/blake3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "13ac9cc003839e6730587218103f4912e7886311",
"version": "1.3.3",
"port-version": 1
},
{
"git-tree": "707d127029e3c2e2c2216fba6e36247ce43414b3",
"version": "1.3.3",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@
},
"blake3": {
"baseline": "1.3.3",
"port-version": 0
"port-version": 1
},
"blas": {
"baseline": "2023-03-25",
Expand Down