setup fixes

This commit is contained in:
John Smith 2022-11-02 19:37:47 -04:00
parent 941cf9309e
commit ee7ccd698d
3 changed files with 355 additions and 171 deletions

489
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,28 @@
#!/bin/bash #!/bin/bash
mkdir /tmp/capnproto-install mkdir /tmp/capnproto-install
cd /tmp/capnproto-install pushd /tmp/capnproto-install
curl -O https://capnproto.org/capnproto-c++-0.9.1.tar.gz curl -O https://capnproto.org/capnproto-c++-0.10.2.tar.gz
tar zxf capnproto-c++-0.9.1.tar.gz tar zxf capnproto-c++-0.10.2.tar.gz
cd capnproto-c++-0.9.1 cd capnproto-c++-0.10.2
./configure ./configure --without-openssl
make -j6 check make -j6 check
make install if [ "$EUID" -ne 0 ]; then
cd / if command -v checkinstall &> /dev/null; then
rm -rf /tmp/capnproto-install sudo checkinstall -y
cp *.deb ~
else
sudo make install
fi
popd
sudo rm -rf /tmp/capnproto-install
else
if command -v checkinstall &> /dev/null; then
checkinstall -y
cp *.deb ~
else
make install
fi
popd
rm -rf /tmp/capnproto-install
fi

View File

@ -77,5 +77,7 @@ rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-andro
cargo install wasm-bindgen-cli wasm-pack cargo install wasm-bindgen-cli wasm-pack
# Ensure packages are installed # Ensure packages are installed
sudo apt-get install libc6-dev-i386 libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 libbz2-1.0:i386 openjdk-11-jdk llvm wabt capnproto protobuf-compiler sudo apt-get install libc6-dev-i386 libc6:i386 libncurses5:i386 libstdc++6:i386 lib32z1 libbz2-1.0:i386 openjdk-11-jdk llvm wabt protobuf-compiler checkinstall
# Install capnproto using the same mechanism as our earthly build
$SCRIPTDIR/scripts/earthly/install_capnproto.sh