Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[triton] Update triton #27424

Merged
merged 13 commits into from
Oct 26, 2022
Merged

[triton] Update triton #27424

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3916e8d
update Triton
illera88 Oct 24, 2022
26df75e
run x-add-version
illera88 Oct 24, 2022
0930563
remove patches. not need them anymore
illera88 Oct 24, 2022
071da61
run x-add-version
illera88 Oct 24, 2022
f679c5b
add boost feature
illera88 Oct 24, 2022
cf6f236
run x-add-version
illera88 Oct 24, 2022
af43b5a
keep boost as feature
illera88 Oct 25, 2022
70ba907
rename as it was before
illera88 Oct 25, 2022
d878e38
run x-add-version
illera88 Oct 25, 2022
879186a
add missing space
illera88 Oct 25, 2022
d4197b3
run x-add-version
illera88 Oct 25, 2022
a81a42a
delete explicit -DBOOST_INTERFACE
illera88 Oct 25, 2022
3cc1f06
run x-add-version
illera88 Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions ports/triton/001-fix-dependency-z3.patch
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions ports/triton/002-fix-capstone-5.patch
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions ports/triton/003-fix-python.patch
View file
Open in desktop

This file was deleted.

12 changes: 4 additions & 8 deletions ports/triton/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO JonathanSalwan/Triton
REF 243026c9c1e07a5ca834c4aaf628d1079f6a85ea
SHA512 9e46c500203647de545286b78a7d4ae6da1796b8eed30fe7346ae6e51865ef70de1adb858c402c3687c471ad654cc6aefdff8893196f5ef7b45e4cee6dd9c577
PATCHES
001-fix-dependency-z3.patch
002-fix-capstone-5.patch
003-fix-python.patch
REF 2b655f20528065cf70e0fa95e2d01b34a8ef6a17
SHA512 819c0c6eb9e5609240fe4be47c1f4584d2979e3b54f34c2978989ad9b3b10f73dc65ac87fca88fbfc26767f7a4df5b3a2ae70bcbda43ec89eef4c456a37bd884
HEAD_REF master
)

string(COMPARE NOTEQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DYNAMICLIB)
Expand All @@ -15,7 +12,6 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATICCRT)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"python" PYTHON_BINDINGS
"boost" BOOST_INTERFACE
Adela0814 marked this conversation as resolved.
Show resolved Hide resolved
)

set(ADDITIONAL_OPTIONS "")
Expand All @@ -31,7 +27,7 @@ vcpkg_cmake_configure(
OPTIONS
${FEATURE_OPTIONS}
-DZ3_INTERFACE=ON
-DTRITON_BOOST_INTERFACE=OFF
-DBOOST_INTERFACE=OFF
-DBUILD_SHARED_LIBS=${DYNAMICLIB}
-DMSVC_STATIC=${STATICCRT}
-DBUILD_EXAMPLES=OFF
Expand Down
2 changes: 1 addition & 1 deletion ports/triton/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "triton",
"version": "0.9",
"port-version": 4,
"port-version": 5,
"description": "Triton is a Dynamic Binary Analysis (DBA) framework. It provides internal components like a Dynamic Symbolic Execution (DSE) engine, a dynamic taint engine, AST representations of the x86, x86-64, ARM32 and AArch64 Instructions Set Architecture (ISA), SMT simplification passes, an SMT solver interface and, the last but not least, Python bindings.",
"homepage": "https://github.com/JonathanSalwan/Triton",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7526,7 +7526,7 @@
},
"triton": {
"baseline": "0.9",
"port-version": 4
"port-version": 5
},
"trompeloeil": {
"baseline": "41",
Expand Down
5 changes: 5 additions & 0 deletions versions/t-/triton.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d5a063acef68b1ffa0daaf40a2fedf27af49282f",
"version": "0.9",
"port-version": 5
},
{
"git-tree": "6b86390804efe4afb7989e40a4cf84ad7877e85a",
"version": "0.9",
Expand Down