From 6591bd9dfd6fe39e9ab17e8c8b24cb75bea1df2a Mon Sep 17 00:00:00 2001 From: Leonid Pospelov Date: Mon, 3 Apr 2023 22:52:26 +0600 Subject: [PATCH] [ChakraCore] enable building without dotnet sdk installed (#30614) * Update portfile.cmake * Update vcpkg.json * Update baseline.json * Update chakracore.json * Update chakracore.json --- ports/chakracore/portfile.cmake | 9 --------- ports/chakracore/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/chakracore.json | 5 +++++ 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake index 21df859e36..5b8c2131eb 100644 --- a/ports/chakracore/portfile.cmake +++ b/ports/chakracore/portfile.cmake @@ -10,14 +10,6 @@ vcpkg_from_github( add-missing-reference.patch # https://github.com/chakra-core/ChakraCore/pull/6862 ) -if(WIN32) - find_path(COR_H_PATH cor.h) - if(COR_H_PATH MATCHES "NOTFOUND") - message(FATAL_ERROR "Could not find . Ensure the NETFXSDK is installed.") - endif() - get_filename_component(NETFXSDK_PATH "${COR_H_PATH}/../.." ABSOLUTE) -endif() - set(BUILDTREE_PATH ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) file(REMOVE_RECURSE ${BUILDTREE_PATH}) file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH}) @@ -31,7 +23,6 @@ if(WIN32) SOURCE_PATH "${BUILDTREE_PATH}" PROJECT_SUBPATH "Build/Chakra.Core.sln" OPTIONS - "/p:DotNetSdkRoot=${NETFXSDK_PATH}/" "/p:CustomBeforeMicrosoftCommonTargets=${CMAKE_CURRENT_LIST_DIR}/no-warning-as-error.props" "/p:RuntimeLib=${CHAKRA_RUNTIME_LIB}" ${PLATFORM_ARG} diff --git a/ports/chakracore/vcpkg.json b/ports/chakracore/vcpkg.json index cf1a325c1e..e64490f3af 100644 --- a/ports/chakracore/vcpkg.json +++ b/ports/chakracore/vcpkg.json @@ -1,7 +1,7 @@ { "name": "chakracore", "version-date": "2022-11-09", - "port-version": 2, + "port-version": 3, "description": "Core part of the Chakra Javascript engine", "homepage": "https://github.com/Microsoft/ChakraCore", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 1ffa9e43ef..a5e6d10cbd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1458,7 +1458,7 @@ }, "chakracore": { "baseline": "2022-11-09", - "port-version": 2 + "port-version": 3 }, "charls": { "baseline": "2.4.1", diff --git a/versions/c-/chakracore.json b/versions/c-/chakracore.json index bc7b91cf01..9c2e3feab2 100644 --- a/versions/c-/chakracore.json +++ b/versions/c-/chakracore.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0e3461099e02572100a3a6731b04fa0c3d12b223", + "version-date": "2022-11-09", + "port-version": 3 + }, { "git-tree": "637e8045c68adfe4a6164f368027093dffb79ab6", "version-date": "2022-11-09",