diff --git a/ports/libb2/portfile.cmake b/ports/libb2/portfile.cmake index 452218f2804874..f387a69b5dc14d 100644 --- a/ports/libb2/portfile.cmake +++ b/ports/libb2/portfile.cmake @@ -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") diff --git a/ports/libb2/vcpkg.json b/ports/libb2/vcpkg.json index e8ef8ec0578ee2..9b3ca94fe2da8b 100644 --- a/ports/libb2/vcpkg.json +++ b/ports/libb2/vcpkg.json @@ -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 + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index 038923a324dce7..c3a0660535a47a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4342,7 +4342,7 @@ }, "libb2": { "baseline": "0.98.1", - "port-version": 6 + "port-version": 7 }, "libbacktrace": { "baseline": "2023-11-30", diff --git a/versions/l-/libb2.json b/versions/l-/libb2.json index b26edd252d9648..9a991a8b892a52 100644 --- a/versions/l-/libb2.json +++ b/versions/l-/libb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bf555d778e96bde29715be0519297dd805b9d2b", + "version": "0.98.1", + "port-version": 7 + }, { "git-tree": "7c113e12089453e4e2cf2bbf67ad1f0b80a133a8", "version": "0.98.1",