Skip to content

Commit

Permalink
[libb2] Enable windows, cleanup (#42952)
Browse files Browse the repository at this point in the history
  • Loading branch information
dg0yt authored Jan 3, 2025
1 parent 41114d5 commit f5eea2e
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 19 deletions.
25 changes: 9 additions & 16 deletions ports/libb2/portfile.cmake
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
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
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
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

0 comments on commit f5eea2e

Please sign in to comment.