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

[libb2] Enable windows, cleanup #42952

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −19
Draft

[libb2] Enable windows, cleanup #42952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 9 additions & 16 deletions ports/libb2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,17 @@ vcpkg_from_github(
HEAD_REF master
)

set(OPTIONS)
if(CMAKE_HOST_WIN32)
set(OPTIONS --disable-native) # requires cpuid
endif()

vcpkg_configure_make(
AUTOCONFIG
SOURCE_PATH ${SOURCE_PATH}
vcpkg_make_configure(
AUTORECONF
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
ax_cv_check_cflags___O3=no # see https://github.com/microsoft/vcpkg/pull/17912#issuecomment-840514179
${OPTIONS}
--disable-native # toolchain may supply -march=native
ax_cv_check_cflags___O3=no # vcpkg provides actual flag
)
vcpkg_install_make()
vcpkg_make_install()
vcpkg_fixup_pkgconfig()


file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

vcpkg_copy_pdbs()

file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
9 changes: 7 additions & 2 deletions ports/libb2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
{
"name": "libb2",
"version": "0.98.1",
"port-version": 6,
"port-version": 7,
"description": "C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp",
"homepage": "https://github.com/BLAKE2/libb2",
"supports": "!windows"
"dependencies": [
{
"name": "vcpkg-make",
"host": true
}
]
}
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 @@ -4342,7 +4342,7 @@
},
"libb2": {
"baseline": "0.98.1",
"port-version": 6
"port-version": 7
},
"libbacktrace": {
"baseline": "2023-11-30",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libb2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4bf555d778e96bde29715be0519297dd805b9d2b",
"version": "0.98.1",
"port-version": 7
},
{
"git-tree": "7c113e12089453e4e2cf2bbf67ad1f0b80a133a8",
"version": "0.98.1",
Expand Down
Loading