[chakracore] Update to 2022-11-09 (#28472)

* [chakracore] Update port

* add version

* .

* remove obsolete funcs

* .

* more tools

* .

* remove obsolete code

* ad ver

* remove excess lib

* remove excess lib

* .

* fix win32

* happy new year bonchEquipment and valitovaa

* update

* fix

* fix

* addver

* fix-plat

* .
This commit is contained in:
Leonid Pospelov 2022-12-29 01:01:51 +04:00 committed by GitHub
parent 031c19f64e
commit df51b93304
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 53 deletions

View File

@ -1,13 +0,0 @@
diff --git a/lib/Common/Memory/RecyclerObjectGraphDumper.cpp b/lib/Common/Memory/RecyclerObjectGraphDumper.cpp
index 0885df3fb..12bdfb96e 100644
--- a/lib/Common/Memory/RecyclerObjectGraphDumper.cpp
+++ b/lib/Common/Memory/RecyclerObjectGraphDumper.cpp
@@ -58,7 +58,7 @@ void RecyclerObjectGraphDumper::BeginDumpObject(void * objectAddress)
{
Assert(false);
this->dumpObjectTypeInfo = nullptr;
- this->dumpObjectIsArray = nullptr;
+ this->dumpObjectIsArray = 0;
}
}
#endif

View File

@ -3,11 +3,10 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/ChakraCore
REF 385409ee4b634b860e090606a28acbc99f4d2567
SHA512 ef47db988c4ddd77fa87f4c5e1ac91d9f6b31b35aa6934d8b2863ee1274776d90a2b85dbad51eef069c96777d3cd7729349b89f23eda8c61b4cb637150bead71
REF fd6908097f758ef65bd83680cf413313ad36c98d
SHA512 c35a2e3680d3ff5c7d715752570b5f12cf9da716ef28377694e9aa079553b5c0276c51a66b342956d217e9842edd12c25af4a001fae34175a2114134ee4428ee
HEAD_REF master
PATCHES
fix-debug-linux-build.patch
add-missing-reference.patch # https://github.com/chakra-core/ChakraCore/pull/6862
)
@ -25,13 +24,25 @@ file(COPY ${SOURCE_PATH}/ DESTINATION ${BUILDTREE_PATH})
if(WIN32)
set(CHAKRA_RUNTIME_LIB "static_library") # ChakraCore only supports static CRT linkage
vcpkg_build_msbuild(
PROJECT_PATH "${BUILDTREE_PATH}/Build/Chakra.Core.sln"
if(VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
set(PLATFORM_ARG PLATFORM x86) # it's x86, not Win32 in sln file
endif()
vcpkg_install_msbuild(
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}
)
file(GLOB_RECURSE LIB_FILES "${CURRENT_PACKAGES_DIR}/lib/*.lib")
file(GLOB_RECURSE DEBUG_LIB_FILES "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib")
foreach(file ${LIB_FILES} ${DEBUG_LIB_FILES})
if(NOT file MATCHES "ChakraCore.lib")
file(REMOVE ${file})
endif()
endforeach()
else()
if(VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
set(CHAKRACORE_TARGET_ARCH amd64)
@ -82,35 +93,7 @@ if(WIN32)
"${BUILDTREE_PATH}/lib/Jsrt/ChakraCoreWindows.h"
DESTINATION "${CURRENT_PACKAGES_DIR}/include"
)
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(INSTALL
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.dll"
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/ChakraCore.pdb"
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin"
)
file(INSTALL
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_debug/Chakracore.lib"
DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib"
)
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(INSTALL
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.dll"
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ChakraCore.pdb"
DESTINATION "${CURRENT_PACKAGES_DIR}/bin"
)
file(INSTALL
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/Chakracore.lib"
DESTINATION "${CURRENT_PACKAGES_DIR}/lib"
)
file(INSTALL
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/ch.exe"
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/GCStress.exe"
"${BUILDTREE_PATH}/Build/VcBuild/bin/${TRIPLET_SYSTEM_ARCH}_release/rl.exe"
DESTINATION "${CURRENT_PACKAGES_DIR}/tools/chakracore"
)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/chakracore")
endif()
# Do not install dll/exe/lib files here because they are handled by vcpkg_install_msbuild
else()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
set(out_file libChakraCore.so)
@ -134,7 +117,9 @@ else()
"${out_dir_release}/ch"
DESTINATION "${CURRENT_PACKAGES_DIR}/tools/chakracore"
)
vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/chakracore")
vcpkg_copy_tools(TOOL_NAMES ch
SEARCH_DIR "${out_dir_release}"
)
endif()
endif()

View File

@ -1,9 +1,18 @@
{
"name": "chakracore",
"version-date": "2021-04-22",
"port-version": 3,
"version-date": "2022-11-09",
"description": "Core part of the Chakra Javascript engine",
"homepage": "https://github.com/Microsoft/ChakraCore",
"license": "MIT",
"supports": "!osx & !uwp & (linux | (!static & !staticcrt))"
"supports": "!osx & !uwp & (linux | (!static & !staticcrt))",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -1393,8 +1393,8 @@
"port-version": 2
},
"chakracore": {
"baseline": "2021-04-22",
"port-version": 3
"baseline": "2022-11-09",
"port-version": 0
},
"charls": {
"baseline": "2.3.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ff01bf142bf069ad4d58ef77933eec4430be79aa",
"version-date": "2022-11-09",
"port-version": 0
},
{
"git-tree": "b1fb3c3a83f78bfa4191c376d026a7768257c9db",
"version-date": "2021-04-22",