Merge branch 'issue-capnproto-build' into 'main'
parameterize install capnproto See merge request veilid/veilid!16
This commit is contained in:
commit
a6c5c2f372
@ -13,7 +13,7 @@ deps-base:
|
||||
deps-capnp:
|
||||
FROM +deps-base
|
||||
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
|
||||
deps-protoc:
|
||||
@ -147,4 +147,4 @@ package-linux-arm64:
|
||||
|
||||
package-linux:
|
||||
BUILD +package-linux-amd64
|
||||
BUILD +package-linux-arm64
|
||||
BUILD +package-linux-arm64
|
||||
|
@ -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
|
||||
cd capnproto-c++-0.10.2
|
||||
./configure --without-openssl
|
||||
make -j6 check
|
||||
make -j$1 check
|
||||
if [ "$EUID" -ne 0 ]; then
|
||||
if command -v checkinstall &> /dev/null; then
|
||||
sudo checkinstall -y
|
||||
|
Loading…
Reference in New Issue
Block a user