Fix static libs

k2-fsa · Sep 21, 2023 · d7c1c4e · d7c1c4e
1 parent 9472416
commit d7c1c4e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/arm-linux-gnueabihf.yaml b/.github/workflows/arm-linux-gnueabihf.yaml
@@ -76,7 +76,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: toolchain
-          key: gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf
+          key: gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf
 
       - name: Download toolchain
         if: steps.cache-toolchain.outputs.cache-hit != 'true'
@@ -87,13 +87,13 @@ jobs:
           ls -lh arm-linux-gcc
 
           mkdir $GITHUB_WORKSPACE/toolchain
-          tar xvf ./arm-linux-gcc/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain
+          tar xvf ./arm-linux-gcc/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain
 
       - name: Display toolchain info
         shell: bash
         run: |
           export PATH=$GITHUB_WORKSPACE/toolchain/bin:$PATH
-          arm-linux-gnueabihf-gcc --version
+          arm-none-linux-gnueabihf-gcc --version
 
       - name: Display qemu-arm -h
         shell: bash

diff --git a/cmake/onnxruntime-linux-arm.cmake b/cmake/onnxruntime-linux-arm.cmake
@@ -11,8 +11,8 @@ if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL arm)
 endif()
 
 set(onnxruntime_URL  "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-1.16.0.zip")
-set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-arm-1.16.0.zip")
-set(onnxruntime_HASH "SHA256=0c794c7bdb089c459b8d8f49fe4f79a3956b665d974145287706c7c7a913506d")
+set(onnxruntime_URL2 )
+set(onnxruntime_HASH "SHA256=0a63ea99fbba3ee399d6626c36752844ae93ae19bab30e4bf00d45cc8a13da02")
 
 # If you don't have access to the Internet,
 # please download onnxruntime to one of the following locations.

diff --git a/cmake/onnxruntime-linux-x86_64-static.cmake b/cmake/onnxruntime-linux-x86_64-static.cmake
@@ -14,10 +14,9 @@ if(BUILD_SHARED_LIBS)
   message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
 endif()
 
-# TODO(fangjun): update the URL
 set(onnxruntime_URL  "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-static_lib-1.16.0.tgz")
-set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/onnxruntime-linux-x64-static_lib-1.16.0.tgz")
-set(onnxruntime_HASH "SHA256=9a66e5df521a28ee8364cd814bb2e87c48bfb751b1a200593feceff99e8cd4ee")
+set(onnxruntime_URL2 )
+set(onnxruntime_HASH "SHA256=a36e989c9a07f12bf16f63acb2217b02a0cf4ac75aa7bc27de76ae08706a5c1f")
 
 # If you don't have access to the Internet,
 # please download onnxruntime to one of the following locations.

diff --git a/cmake/onnxruntime-win-x64-static.cmake b/cmake/onnxruntime-win-x64-static.cmake
@@ -17,7 +17,7 @@ endif()
 
 set(onnxruntime_URL  "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-static-1.16.0.tar.bz2")
 set(onnxruntime_URL2 "")
-set(onnxruntime_HASH "SHA256=79771e24484010c004081b2aa6b4ca15cd344ebcc15c103babc945caa978ce2c")
+set(onnxruntime_HASH "SHA256=d1b87e8a438a7e31b46bf13a194c5ac38fdf60ebeefef82692008e42e3242776")
 
 # If you don't have access to the Internet,
 # please download onnxruntime to one of the following locations.

diff --git a/cmake/onnxruntime-win-x86-static.cmake b/cmake/onnxruntime-win-x86-static.cmake
@@ -17,7 +17,7 @@ endif()
 
 set(onnxruntime_URL  "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-static-1.16.0.tar.bz2")
 set(onnxruntime_URL2 "")
-set(onnxruntime_HASH "SHA256=d03359dbd534aab621fb08b93929118ca5cfc35243071f96d2733c0cecb38616")
+set(onnxruntime_HASH "SHA256=aedb6b5275f7832ac5117db8e40328a0842ae8ce6749a0c99bcb4218c53fdc60")
 
 # If you don't have access to the Internet,
 # please download onnxruntime to one of the following locations.