From 88b2026624e7875e2d39828f944aeadae09edf27 Mon Sep 17 00:00:00 2001 From: Mike Nolan Date: Fri, 5 Sep 2025 12:08:11 -0500 Subject: [PATCH] Fix builds --- .onedev-buildspec.yml | 4 ++-- Packaging/Linux/build-ubuntu-jammy.sh | 4 ++-- Packaging/Linux/build-ubuntu-plucky.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml index 9e9d871..9899458 100644 --- a/.onedev-buildspec.yml +++ b/.onedev-buildspec.yml @@ -58,7 +58,7 @@ jobs: interpreter: !DefaultInterpreter commands: | apt update -y - apt install -y libffi-dev pkg-config + apt install -y pkg-config cd Packaging/Linux bash build-ubuntu-jammy.sh bash push-ubuntu-jammy.sh @@ -74,7 +74,7 @@ jobs: interpreter: !DefaultInterpreter commands: | apt update -y - apt install -y libffi-dev pkg-config + apt install -y pkg-config cd Packaging/Linux bash build-ubuntu-plucky.sh bash push-ubuntu-plucky.sh diff --git a/Packaging/Linux/build-ubuntu-jammy.sh b/Packaging/Linux/build-ubuntu-jammy.sh index 67e126f..2ab735d 100644 --- a/Packaging/Linux/build-ubuntu-jammy.sh +++ b/Packaging/Linux/build-ubuntu-jammy.sh @@ -5,7 +5,7 @@ cd build/jammy wget -O Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm https://downloads.tesses.net/ShellPackage.crvm mkdir build-amd64 apt install -y tessesframework -cmake -S ../../../../ -B build-amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCROSSLANG_ENABLE_FFI=ON +cmake -S ../../../../ -B build-amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF cd build-amd64 make -j`nproc` make install DESTDIR=../crosslang_$DEB_VERSION\_amd64 @@ -20,7 +20,7 @@ dpkg-deb --build crosslang_$DEB_VERSION\_amd64 foreign() { apt install -y tessesframework:$1 mkdir build-$1 - cmake -S ../../../../ -B build-$1 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCROSSLANG_ENABLE_FFI=ON -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1\.cmake + cmake -S ../../../../ -B build-$1 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1\.cmake cd build-$1 make -j`nproc` make install DESTDIR=../crosslang_$DEB_VERSION\_$1 diff --git a/Packaging/Linux/build-ubuntu-plucky.sh b/Packaging/Linux/build-ubuntu-plucky.sh index 582e823..e076902 100644 --- a/Packaging/Linux/build-ubuntu-plucky.sh +++ b/Packaging/Linux/build-ubuntu-plucky.sh @@ -5,7 +5,7 @@ cd build/plucky wget -O Tesses.CrossLang.ShellPackage-1.0.0.0-prod.crvm https://downloads.tesses.net/ShellPackage.crvm mkdir build-amd64 apt install -y tessesframework -cmake -S ../../../../ -B build-amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCROSSLANG_ENABLE_FFI=ON +cmake -S ../../../../ -B build-amd64 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF cd build-amd64 make -j`nproc` make install DESTDIR=../crosslang_$DEB_VERSION\_amd64 @@ -20,7 +20,7 @@ dpkg-deb --build crosslang_$DEB_VERSION\_amd64 foreign() { apt install -y tessesframework:$1 mkdir build-$1 - cmake -S ../../../../ -B build-$1 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCROSSLANG_ENABLE_FFI=ON -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1\.cmake + cmake -S ../../../../ -B build-$1 -DCMAKE_INSTALL_PREFIX=/usr -DCROSSLANG_FETCHCONTENT=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/toolchains/$1\.cmake cd build-$1 make -j`nproc` make install DESTDIR=../crosslang_$DEB_VERSION\_$1