Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-12-25 23:39:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-capnproto-build' into 'main'

Browse Source 
parameterize install capnproto

See merge request veilid/veilid!16
This commit is contained in:
John Smith 2023-02-26 00:54:30 +00:00
commit a6c5c2f372
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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:

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