diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index 36141ffcbc..c03f48c48f 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -11,17 +11,23 @@ vcpkg_extract_source_archive_ex( PATCHES fix-import-export-macros.patch ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + INVERTED_FEATURES + tool BZIP2_SKIP_TOOLS +) + file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + OPTIONS + ${FEATURE_OPTIONS} OPTIONS_DEBUG -DBZIP2_SKIP_HEADERS=ON -DBZIP2_SKIP_TOOLS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() file(READ "${CURRENT_PACKAGES_DIR}/include/bzlib.h" BZLIB_H) diff --git a/ports/bzip2/vcpkg.json b/ports/bzip2/vcpkg.json index 2f8b8aabf3..55cdb4ac54 100644 --- a/ports/bzip2/vcpkg.json +++ b/ports/bzip2/vcpkg.json @@ -1,8 +1,27 @@ { "name": "bzip2", "version-semver": "1.0.8", - "port-version": 2, + "port-version": 3, "description": "bzip2 is a freely available, patent free, high-quality data compressor. It typically compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical compressors), whilst being around twice as fast at compression and six times faster at decompression.", "homepage": "https://sourceware.org/bzip2/", - "documentation": "https://sourceware.org/bzip2/docs.html" + "documentation": "https://sourceware.org/bzip2/docs.html", + "license": "bzip2-1.0.6", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], + "default-features": [ + "tool" + ], + "features": { + "tool": { + "description": "Builds bzip2 executable" + } + } } diff --git a/versions/b-/bzip2.json b/versions/b-/bzip2.json index 7025c509f3..b5fb289ec5 100644 --- a/versions/b-/bzip2.json +++ b/versions/b-/bzip2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ee6ad1d0bf78137f7f77671f393abc83363a710", + "version-semver": "1.0.8", + "port-version": 3 + }, { "git-tree": "a1ea352502e69888a565563d9151d3f7ab609fb1", "version-semver": "1.0.8", diff --git a/versions/baseline.json b/versions/baseline.json index aa5f2f68a1..f84b60c071 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1230,7 +1230,7 @@ }, "bzip2": { "baseline": "1.0.8", - "port-version": 2 + "port-version": 3 }, "c-ares": { "baseline": "1.18.1",