Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[libvpx] Fix build on systems where make is not gmake (#45569)

This commit is contained in:
CQ_Undefine 2025-05-22 09:37:10 +02:00 committed by GitHub
parent 4008642a50
commit ed94c38595
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/libvpx/portfile.cmake
View File

@ -229,6 +229,12 @@ else()
set(LIBVPX_TARGET "generic-gnu") # use default target
endif()
if (VCPKG_HOST_IS_OPENBSD OR VCPKG_HOST_IS_FREEBSD)
set(MAKE_BINARY "gmake")
else()
set(MAKE_BINARY "make")
endif()
message(STATUS "Build info. Target: ${LIBVPX_TARGET}; Options: ${OPTIONS}")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
@ -249,7 +255,7 @@ else()
message(STATUS "Building libvpx for Release")
vcpkg_execute_required_process(
COMMAND
${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
${BASH} --noprofile --norc -c "${MAKE_BINARY} -j${VCPKG_CONCURRENCY}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
LOGNAME build-${TARGET_TRIPLET}-rel
)
@ -257,7 +263,7 @@ else()
message(STATUS "Installing libvpx for Release")
vcpkg_execute_required_process(
COMMAND
${BASH} --noprofile --norc -c "make install"
${BASH} --noprofile --norc -c "${MAKE_BINARY} install"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
LOGNAME install-${TARGET_TRIPLET}-rel
)
@ -283,7 +289,7 @@ else()
message(STATUS "Building libvpx for Debug")
vcpkg_execute_required_process(
COMMAND
${BASH} --noprofile --norc -c "make -j${VCPKG_CONCURRENCY}"
${BASH} --noprofile --norc -c "${MAKE_BINARY} -j${VCPKG_CONCURRENCY}"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
LOGNAME build-${TARGET_TRIPLET}-dbg
)
@ -291,7 +297,7 @@ else()
message(STATUS "Installing libvpx for Debug")
vcpkg_execute_required_process(
COMMAND
${BASH} --noprofile --norc -c "make install"
${BASH} --noprofile --norc -c "${MAKE_BINARY} install"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
LOGNAME install-${TARGET_TRIPLET}-dbg
)

2
ports/libvpx/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "libvpx",
"version": "1.13.1",
"port-version": 4,
"port-version": 5,
"description": "The reference software implementation for the video coding formats VP8 and VP9.",
"homepage": "https://github.com/webmproject/libvpx",
"license": "BSD-3-Clause",

2
versions/baseline.json
View File

@ -5510,7 +5510,7 @@
},
"libvpx": {
"baseline": "1.13.1",
"port-version": 4
"port-version": 5
},
"libwandio": {
"baseline": "4.2.1",

5
versions/l-/libvpx.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "71c206529474f4d9bc8f5fbbdb72cc5d13057825",
"version": "1.13.1",
"port-version": 5
},
{
"git-tree": "51aa3269c3e4839a7c789ba5e7f25e653ef65b27",
"version": "1.13.1",