From 7aed17856b01bea41026c8fc1b291dd67eaf35ca Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Wed, 31 May 2023 11:55:10 -0700 Subject: [PATCH] [angelscript] fix build dependency error (#31711) * [angelscript] fix build dependency errors * update version * update portfile.cmake * update version --------- Co-authored-by: Zhao Liu --- ports/angelscript/fix-dependency.patch | 9 +++++++++ ports/angelscript/portfile.cmake | 1 + ports/angelscript/vcpkg.json | 1 + versions/a-/angelscript.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ports/angelscript/fix-dependency.patch diff --git a/ports/angelscript/fix-dependency.patch b/ports/angelscript/fix-dependency.patch new file mode 100644 index 0000000000..be5213f84a --- /dev/null +++ b/ports/angelscript/fix-dependency.patch @@ -0,0 +1,9 @@ +diff --git a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake +index 4d1ef0f..ec14fe9 100644 +--- a/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake ++++ b/angelscript/projects/cmake/cmake/AngelscriptConfig.cmake +@@ -1,2 +1,4 @@ + include("${CMAKE_CURRENT_LIST_DIR}/AngelscriptTargets.cmake") ++include(CMakeFindDependencyMacro) ++find_dependency(Threads REQUIRED) + diff --git a/ports/angelscript/portfile.cmake b/ports/angelscript/portfile.cmake index f8ea42f52e..ac93fa2d04 100644 --- a/ports/angelscript/portfile.cmake +++ b/ports/angelscript/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_extract_source_archive( ARCHIVE "${ARCHIVE}" PATCHES mark-threads-private.patch + fix-dependency.patch ) vcpkg_cmake_configure( diff --git a/ports/angelscript/vcpkg.json b/ports/angelscript/vcpkg.json index b9662364dd..472f7a8115 100644 --- a/ports/angelscript/vcpkg.json +++ b/ports/angelscript/vcpkg.json @@ -1,6 +1,7 @@ { "name": "angelscript", "version": "2.36.1", + "port-version": 1, "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.", "homepage": "https://angelcode.com/angelscript", "license": "Zlib", diff --git a/versions/a-/angelscript.json b/versions/a-/angelscript.json index 49745dd32a..d6c134f048 100644 --- a/versions/a-/angelscript.json +++ b/versions/a-/angelscript.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c1bc126371829227e923c11f029a539a234a483", + "version": "2.36.1", + "port-version": 1 + }, { "git-tree": "e90e0fe54ab8038226b849471fba169157753c19", "version": "2.36.1", diff --git a/versions/baseline.json b/versions/baseline.json index d661515fb4..6b408cde14 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -118,7 +118,7 @@ }, "angelscript": { "baseline": "2.36.1", - "port-version": 0 + "port-version": 1 }, "angle": { "baseline": "chromium_5414",