From 425ebe344f2f663bf90c24253bdfc87ae81a87c3 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Tue, 2 Aug 2022 14:48:39 -0400 Subject: [PATCH] Update sleigh portfile to latest cmake-refactor commit TODO: We should split out the sleigh compiler tool into its own port to support cross-compilation better. The host only needs the compiler and not the libraries --- ports/sleigh/portfile.cmake | 20 ++++++++++++-------- ports/sleigh/vcpkg.json | 16 ++++++++++------ vcpkg.json | 14 ++------------ 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/ports/sleigh/portfile.cmake b/ports/sleigh/portfile.cmake index adce8cf6..e6995a1e 100644 --- a/ports/sleigh/portfile.cmake +++ b/ports/sleigh/portfile.cmake @@ -1,19 +1,19 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO lifting-bits/sleigh - REF 814b41c45dd4ce357bd1982a6c7e01c3dbcc1aa8 # cmake-presets branch, unmerged - SHA512 ff0273f092f3f546f4beed50d0dba8cdb885a4ef3d623acd62b3fb2cfe50c5a20993ca7d193dd8170847676e86177362f338e5d4ac20a8080b6f0bb253ea9ac8 + REF 04db45f0b73372aa038e79b7e3fc44c3eb14732b # cmake-presets branch, unmerged + SHA512 f1ed643e25a021f42bcb201a184bb453d8a546df4c1e0157fad3d36ff883ddb1dc5076610f074e8ae184eb389d60dbd0f03e9000d1cc60b629578d95e7a99d0c HEAD_REF master ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES "sleighspecs" sleigh_BUILD_SLEIGHSPECS # compiled sla files - "spec-compiler" sleigh_BUILD_SPECCOMPILER # Compiler - "decompiler" sleigh_BUILD_DECOMPILER # Decompiler - "ghidra" sleigh_BUILD_GHIDRA # Ghidra - "support" sleigh_BUILD_SUPPORT # Support libraries - "extra-tools" sleigh_BUILD_EXTRATOOLS # Extra tools + "spec-compiler" sleigh_BUILD_SPECCOMPILER # sla spec compiler + "decompiler" sleigh_BUILD_DECOMPILER # decompiler + "ghidra" sleigh_BUILD_GHIDRA # ghidra tool + "support" sleigh_BUILD_SUPPORT # support libraries + "extra-tools" sleigh_BUILD_EXTRATOOLS # extra tools ) set(tools "") @@ -84,4 +84,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR NOT VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file( + INSTALL "${SOURCE_PATH}/LICENSE" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/ports/sleigh/vcpkg.json b/ports/sleigh/vcpkg.json index e472d03a..62e0a61b 100644 --- a/ports/sleigh/vcpkg.json +++ b/ports/sleigh/vcpkg.json @@ -1,6 +1,6 @@ { "name": "sleigh", - "version": "10.1.4", + "version": "10.1.5", "description": "Unofficial CMake build for Ghidra SLEIGH", "homepage": "https://github.com/lifting-bits/sleigh", "dependencies": [ @@ -11,13 +11,17 @@ { "name": "vcpkg-cmake-config", "host": true + }, + { + "name": "sleigh", + "host": true, + "default-features": false, + "features": [ + "spec-compiler" + ] } ], - "default-features": [ - "sleighspecs", - "support", - "tools" - ], + "default-features": [], "features": { "decompiler": { "description": "Build the decompiler tool" diff --git a/vcpkg.json b/vcpkg.json index f15d42ea..f77621ac 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,18 +1,8 @@ { - "name": "maat", - "version-semver": "0.5.1", - "builtin-baseline": "cef0b3ec767df6e83806899fe9525f6cf8d7bc91", "dependencies": [ "gmp", "lief", - { - "name": "sleigh", - "default-features": false, - "features": [ - "spec-compiler" - ] - }, + "sleigh", "z3" - ], - "default-features": [] + ] }