Skip to content

Commit

Permalink
[ci] Copy libicu .so on aarch64, try to fix M1 build steps
Browse files Browse the repository at this point in the history
  • Loading branch information
jcelerier committed Dec 26, 2023
1 parent 020a2cd commit 790962c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion ci/create-sdk-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
: "$SDK_DIR"
: "$SCORE_DIR"
: "$XCODE_ROOT"
: "$MACOS_ARCH"

export OSSIA_SDK="/opt/ossia-sdk-x86_64"
export OSSIA_SDK="/opt/ossia-sdk-$MACOS_ARCH"
export DST="$SDK_DIR"
export INCLUDE="$DST/usr/include"
export LIB="$DST/usr/lib"
Expand Down
1 change: 1 addition & 0 deletions ci/raspberrypi-aarch64.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ cmake --build . --target install/strip
rm -rf include lib share/doc
mkdir lib
cp /opt/ossia-sdk-rpi-aarch64/aarch64-rpi3-linux-gnu/aarch64-rpi3-linux-gnu/lib64/libstdc++.so.6 lib/
cp /opt/ossia-sdk-rpi-aarch64/pi/sysroot/usr/lib/aarch64-linux-gnu/libicu*.so.67 lib/
cp $SCORE_DIR/cmake/Deployment/Linux/Raspberry/* .
)

Expand Down
2 changes: 1 addition & 1 deletion ci/suse-leap.deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $SUDO zypper -n install \
ffmpeg-4-libavcodec-devel ffmpeg-4-libavdevice-devel ffmpeg-4-libavfilter-devel ffmpeg-4-libavformat-devel ffmpeg-4-libswresample-devel \
curl gzip

curl -L -0 https://github.com/Kitware/CMake/releases/download/v3.26.4/cmake-3.26.4-linux-x86_64.tar.gz --output cmake.tgz
curl -L -0 https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.tar.gz --output cmake.tgz
tar xaf cmake.tgz
rm cmake.tgz

Expand Down

0 comments on commit 790962c

Please sign in to comment.