From 183d89fc73e2c76b0ad87cf6646f9e0b2d82f6e1 Mon Sep 17 00:00:00 2001 From: shxyke Date: Thu, 9 Mar 2023 12:01:03 +0000 Subject: [PATCH 1/4] fix strip error for Android libs --- maadeps/runtime_android.py | 1 - vcpkg-overlay/triplets/maa-arm64-android.cmake | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/maadeps/runtime_android.py b/maadeps/runtime_android.py index b03b0db..a1639ef 100644 --- a/maadeps/runtime_android.py +++ b/maadeps/runtime_android.py @@ -19,7 +19,6 @@ def split_debug(file, debug_file): objcopy = subprocess.check_output([ndk_which, "objcopy"]).decode().strip() objcopy = os.environ.get("OBJCOPY", objcopy) subprocess.check_call([objcopy, "--only-keep-debug", "--", file, temp_debug_file]) - subprocess.check_call([objcopy, "--strip-unneeded", "--add-gnu-debuglink=" + str(temp_debug_file), "--", file]) shutil.move(temp_debug_file, debug_file) def is_elf(file): diff --git a/vcpkg-overlay/triplets/maa-arm64-android.cmake b/vcpkg-overlay/triplets/maa-arm64-android.cmake index a37ac39..6cf84ba 100644 --- a/vcpkg-overlay/triplets/maa-arm64-android.cmake +++ b/vcpkg-overlay/triplets/maa-arm64-android.cmake @@ -3,6 +3,7 @@ set(VCPKG_CRT_LINKAGE dynamic) set(VCPKG_CMAKE_SYSTEM_NAME Android) set(VCPKG_CMAKE_SYSTEM_VERSION 23) set(VCPKG_BUILD_TYPE release) -set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF) +set(VCPKG_CMAKE_CONFIGURE_OPTIONS ${VCPKG_CMAKE_CONFIGURE_OPTIONS} -DANDROID_USE_LEGACY_TOOLCHAIN_FILE=OFF + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-s") include(${CMAKE_CURRENT_LIST_DIR}/maa-linux-library-override.cmake.inc) From bed5aa0da426012a4c7342af276b710ad3aab241 Mon Sep 17 00:00:00 2001 From: shxyke Date: Thu, 9 Mar 2023 12:03:19 +0000 Subject: [PATCH 2/4] fix find_package error for Android --- maadeps.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maadeps.cmake b/maadeps.cmake index 4b0d96f..8e5a826 100644 --- a/maadeps.cmake +++ b/maadeps.cmake @@ -38,7 +38,7 @@ if(NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/vcpkg/installed/${MAADEPS_TRIPLET}") " or maadeps-build.py to build from source\n" ) endif() -list(PREPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/vcpkg/installed/${MAADEPS_TRIPLET}") +list(PREPEND CMAKE_FIND_ROOT_PATH "${CMAKE_CURRENT_LIST_DIR}/vcpkg/installed/${MAADEPS_TRIPLET}") function(maadeps_install) install(DIRECTORY "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/runtime/${MAADEPS_TRIPLET}/" DESTINATION . USE_SOURCE_PERMISSIONS) From d11ac876de2cdffece54da28c4f25713a07a0043 Mon Sep 17 00:00:00 2001 From: shxyke Date: Thu, 9 Mar 2023 12:04:02 +0000 Subject: [PATCH 3/4] add range-v3 for Android and MacOS --- vcpkg.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 329c6f0..27282bc 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -31,6 +31,10 @@ }, "maa-fastdeploy", "zlib", - "asio" + "asio", + { + "name": "range-v3", + "platform": "osx | android" + } ] } From b3f72efa5b92788b646929ce091a14f8ebd1768c Mon Sep 17 00:00:00 2001 From: shxyke Date: Thu, 9 Mar 2023 12:05:13 +0000 Subject: [PATCH 4/4] fix schema register error in onnx --- vcpkg-overlay/ports/onnx/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/vcpkg-overlay/ports/onnx/portfile.cmake b/vcpkg-overlay/ports/onnx/portfile.cmake index db765db..f0abf6a 100644 --- a/vcpkg-overlay/ports/onnx/portfile.cmake +++ b/vcpkg-overlay/ports/onnx/portfile.cmake @@ -39,6 +39,7 @@ vcpkg_cmake_configure( -DONNX_USE_MSVC_STATIC_RUNTIME=${USE_STATIC_RUNTIME} -DONNX_BUILD_TESTS=OFF -DONNX_BUILD_BENCHMARKS=OFF + -DONNX_DISABLE_STATIC_REGISTRATION=ON MAYBE_UNUSED_VARIABLES ONNX_USE_MSVC_STATIC_RUNTIME )