Extract build dependencies from autobuild script

threefoldtech · Feb 8, 2023 · 37543d7 · 37543d7
1 parent d41d28d
commit 37543d7
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 41 deletions.
diff --git a/autobuild/dependencies.sh b/autobuild/dependencies.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+set -ex
+
+makeopts="-j $(grep ^flags /proc/cpuinfo | wc -l)"
+
+dependencies() {
+ apt-get update
+
+ apt-get install -y build-essential git libsnappy-dev libz-dev \
+ libtar-dev libb2-dev autoconf libtool libjansson-dev \
+ libhiredis-dev libsqlite3-dev libssl-dev libmbedtls-dev
+}
+
+libcurl() {
+ git clone --depth=1 -b curl-7_62_0 https://github.com/curl/curl
+ pushd curl
+ autoreconf -f -i -s
+
+ ./configure --disable-debug --enable-optimize --disable-curldebug --disable-symbol-hiding --disable-rt \
+ --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict \
+ --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher \
+ --disable-manual --disable-libcurl-option --disable-sspi --disable-ntlm-wb --without-brotli --without-librtmp --without-winidn \
+ --disable-threaded-resolver \
+ --without-ssl --with-mbedtls
+
+ make ${makeopts}
+ make install
+ ldconfig
+
+ popd
+}
+
+capnp() {
+ git clone https://github.com/opensourcerouting/c-capnproto
+ pushd c-capnproto
+ git submodule update --init --recursive
+ autoreconf -f -i -s
+
+ ./configure
+ make ${makeopts}
+ make install
+ ldconfig
+
+ popd
+}
+
diff --git a/autobuild/zflist.sh b/autobuild/zflist.sh
@@ -1,48 +1,8 @@
 #!/bin/bash
 set -ex
 
-makeopts="-j $(grep ^flags /proc/cpuinfo | wc -l)"
 
-dependencies() {
- apt-get update
-
- apt-get install -y build-essential git libsnappy-dev libz-dev \
- libtar-dev libb2-dev autoconf libtool libjansson-dev \
- libhiredis-dev libsqlite3-dev libssl-dev libmbedtls-dev
-}
-
-libcurl() {
- git clone --depth=1 -b curl-7_62_0 https://github.com/curl/curl
- pushd curl
- autoreconf -f -i -s
-
- ./configure --disable-debug --enable-optimize --disable-curldebug --disable-symbol-hiding --disable-rt \
- --disable-ftp --disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict \
- --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smb --disable-smtp --disable-gopher \
- --disable-manual --disable-libcurl-option --disable-sspi --disable-ntlm-wb --without-brotli --without-librtmp --without-winidn \
- --disable-threaded-resolver \
- --without-ssl --with-mbedtls
-
- make ${makeopts}
- make install
- ldconfig
-
- popd
-}
-
-capnp() {
- git clone https://github.com/opensourcerouting/c-capnproto
- pushd c-capnproto
- git submodule update --init --recursive
- autoreconf -f -i -s
-
- ./configure
- make ${makeopts}
- make install
- ldconfig
-
- popd
-}
+source dependencies.sh
 
 zeroflist() {
  git clone -b development-v2 https://github.com/threefoldtech/0-flist