Skip to content

Commit

Permalink
Revert "bring in libseccomp for ci"
Browse files Browse the repository at this point in the history
This reverts commit 33e85fd.
  • Loading branch information
riptl authored and marcus-ares committed Apr 19, 2023
1 parent 2c108b2 commit e74716c
Showing 1 changed file with 6 additions and 34 deletions.
40 changes: 6 additions & 34 deletions deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,18 +91,16 @@ fetch () {
fetch_repo elfutils git://sourceware.org/git/elfutils.git
fetch_repo libbpf https://github.com/libbpf/libbpf
fetch_repo openssl https://github.com/quictls/openssl
fetch_repo libseccomp https://github.com/seccomp/libseccomp.git

checkout_repo zlib "v1.2.13"
checkout_repo zstd "v1.5.4"
checkout_repo elfutils "elfutils-0.189"
checkout_repo libbpf "v1.1.0"
checkout_repo openssl "OpenSSL_1_1_1t-quic1"
checkout_repo libseccomp "release-2.5"
}

check_fedora_pkgs () {
local REQUIRED_RPMS=( perl autoconf gettext-devel automake flex bison gperf )
local REQUIRED_RPMS=( perl autoconf gettext-devel automake flex bison )

echo "[~] Checking for required RPM packages"

Expand Down Expand Up @@ -328,38 +326,12 @@ install_openssl () {
echo "[~] Installed all dependencies"
}

install_libseccomp () {
if pkg-config --exists libseccomp; then
echo "[~] libseccomp already installed at $(pkg-config --path libseccomp), skipping installation"
return 0
fi

cd ./opt/git/libseccomp

echo "[+] Configuring libseccomp"
./autogen.sh
./configure \
--prefix="$PREFIX"
echo "[+] Configured libseccomp"

echo "[+] Building libseccomp"
make -j --output-sync=target
echo "[+] Successfully built libseccomp"

echo "[+] Installing libseccomp to $PREFIX"
make install
echo "[+] Successfully installed libseccomp"

echo "[~] Installed all dependencies"
}

install () {
( install_zlib )
( install_zstd )
( install_elfutils )
( install_libbpf )
( install_openssl )
( install_libseccomp )
( install_zlib )
( install_zstd )
( install_elfutils )
( install_libbpf )
( install_openssl )

echo "[~] Done! To wire up $(pwd)/opt with make, run:"
echo " source activate-opt"
Expand Down

0 comments on commit e74716c

Please sign in to comment.