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

[capstone] Use static runtime if capstone wants to be statically linked #23122

Merged
merged 17 commits into from
Feb 22, 2022
Merged

[capstone] Use static runtime if capstone wants to be statically linked #23122

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9b599de
Use static runtime if capstone wants to be statically linked
illera88 Feb 16, 2022
5e4cf0d
increase port-version
illera88 Feb 16, 2022
4c562ea
Update version database
illera88 Feb 16, 2022
7bf72d2
select CRT as new feature
illera88 Feb 17, 2022
299e7fa
don't use upercase in feature name
illera88 Feb 17, 2022
d403f62
format json
illera88 Feb 17, 2022
3708004
run x-add-version
illera88 Feb 17, 2022
c90ee86
remove extra space
illera88 Feb 17, 2022
51d5d42
run x-add-version
illera88 Feb 17, 2022
f922dbd
Modernize the port file.cmake
JonLiu1993 Feb 17, 2022
d49e40f
update version
JonLiu1993 Feb 17, 2022
45d790d
checking feature per OS
illera88 Feb 21, 2022
af19fec
update versioning
illera88 Feb 21, 2022
b24c4e2
remove check for static CRT on windows so it doesn't conflict with ot…
illera88 Feb 21, 2022
b61afa6
update versioning
illera88 Feb 21, 2022
de2f6bf
use VCPKG_CRT_LINKAGE instead of feature for CRT
illera88 Feb 21, 2022
9a52604
update versioning
illera88 Feb 21, 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
21 changes: 12 additions & 9 deletions ports/capstone/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,34 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"x86-reduce" CAPSTONE_X86_REDUCE
"xcore" CAPSTONE_XCORE_SUPPORT
"diet" CAPSTONE_BUILD_DIET
"static-crt" CAPSTONE_BUILD_STATIC_RUNTIME
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
if ("osxkernel" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_OSX)
message(FATAL_ERROR "Feature 'osxkernel' only supported in OSX")
endif()

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCAPSTONE_BUILD_STATIC=${CS_BUILD_STATIC}
-DCAPSTONE_BUILD_SHARED=${CS_BUILD_SHARED}
-DCAPSTONE_BUILD_TESTS=OFF
-DCAPSTONE_BUILD_CSTOOL=OFF
-DCAPSTONE_BUILD_STATIC_RUNTIME=OFF
-DCAPSTONE_X86_ONLY=OFF
${FEATURE_OPTIONS}
)

vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(GLOB EXES "${CURRENT_PACKAGES_DIR}/bin/*.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe")
if(EXES)
file(REMOVE ${EXES})
endif()
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
15 changes: 14 additions & 1 deletion ports/capstone/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
{
"name": "capstone",
"version": "4.0.2",
"port-version": 2,
"port-version": 3,
"description": "Multi-architecture disassembly framework",
"homepage": "https://github.com/aquynh/capstone",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake",
"host": true
}
],
"features": {
"arm": {
"description": "Capstone disassembly support for ARM"
Expand Down Expand Up @@ -35,6 +45,9 @@
"sparc": {
"description": "Capstone disassembly support for SPARC"
},
"static-crt": {
"description": "Use Windows C Runtime Library (CRT)"
},
"sysz": {
"description": "Capstone disassembly support for SysZ"
},
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 @@ -1234,7 +1234,7 @@
},
"capstone": {
"baseline": "4.0.2",
"port-version": 2
"port-version": 3
},
"cartographer": {
"baseline": "1.0.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/capstone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b17d5e945550d7a601132fc223d112dd87990209",
"version": "4.0.2",
"port-version": 3
},
{
"git-tree": "465e527988f09c855e156cff45b7ee6dfbe1d303",
"version": "4.0.2",
Expand Down