liz/veilid
liz/veilid
1
0
Fork 0
Code Pull Requests Packages Releases Activity

Merge branch 'main' of gitlab.hackers.town:veilid/veilid into dev

Browse Source
This commit is contained in:
John Smith 2023-02-25 19:55:26 -05:00
commit e328bdc270
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Earthfile
View File

@ -13,7 +13,7 @@ deps-base:
deps-capnp: deps-capnp:
FROM +deps-base FROM +deps-base
COPY scripts/earthly/install_capnproto.sh / COPY scripts/earthly/install_capnproto.sh /
RUN /bin/bash /install_capnproto.sh; rm /install_capnproto.sh RUN /bin/bash /install_capnproto.sh 1; rm /install_capnproto.sh
# Install protoc # Install protoc
deps-protoc: deps-protoc:
@ -147,4 +147,4 @@ package-linux-arm64:
package-linux: package-linux:
BUILD +package-linux-amd64 BUILD +package-linux-amd64
BUILD +package-linux-arm64 BUILD +package-linux-arm64

2
scripts/earthly/install_capnproto.sh
View File

@ -5,7 +5,7 @@ curl -O https://capnproto.org/capnproto-c++-0.10.2.tar.gz
tar zxf capnproto-c++-0.10.2.tar.gz tar zxf capnproto-c++-0.10.2.tar.gz
cd capnproto-c++-0.10.2 cd capnproto-c++-0.10.2
./configure --without-openssl ./configure --without-openssl
make -j6 check make -j$1 check
if [ "$EUID" -ne 0 ]; then if [ "$EUID" -ne 0 ]; then
if command -v checkinstall &> /dev/null; then if command -v checkinstall &> /dev/null; then
sudo checkinstall -y sudo checkinstall -y