Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makefile: add libpsl to the build #48

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Makefile: add libpsl to the build #48

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a84321c
Makefile: add libpsl to the build
bagder Jan 15, 2024
ade2648
fixup add libpsl-devel to fedora
bagder Jan 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ base=docker.io/alpine:3.18.5
arch=""
compiler="gcc"
build_opts=" --enable-static --disable-ldap --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr --with-gssapi"
dev_deps="git zsh libssh2 libssh2-dev libssh2-static autoconf automake build-base groff openssl curl-dev python3 python3-dev libtool curl stunnel perl nghttp2 brotli brotli-dev krb5-dev"
base_deps="brotli brotli-dev libssh2 nghttp2-dev libidn2 krb5"
dev_deps="git zsh libssh2 libssh2-dev libssh2-static autoconf automake build-base groff openssl curl-dev python3 python3-dev libtool curl stunnel perl nghttp2 brotli brotli-dev krb5-dev libpsl-dev"
base_deps="brotli brotli-dev libssh2 nghttp2-dev libidn2 krb5 libpsl"

##############################################
# debian dev image
Expand All @@ -19,7 +19,7 @@ base_deps="brotli brotli-dev libssh2 nghttp2-dev libidn2 krb5"
# > make branch_or_ref=master release_tag=master build_debian
#
build_debian:
./create_dev_image.sh ${arch} ${debian_base} ${compiler} "git zsh libssh2-1 libssh2-1-dev autoconf automake build-essential groff libcurl4-openssl-dev python3 python3-dev libtool curl stunnel perl nghttp2 brotli libssl-dev" " --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr" ${branch_or_ref} curl-dev-debian:${release_tag}
./create_dev_image.sh ${arch} ${debian_base} ${compiler} "git zsh libssh2-1 libssh2-1-dev autoconf automake build-essential groff libcurl4-openssl-dev python3 python3-dev libtool curl stunnel perl nghttp2 brotli libssl-dev libpsl-dev" " --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr" ${branch_or_ref} curl-dev-debian:${release_tag}

##############################################
# fedora dev image
Expand All @@ -28,7 +28,7 @@ build_debian:
# > make branch_or_ref=master release_tag=master build_fedora
#
build_fedora:
./create_dev_image.sh ${arch} ${fedora_base} ${compiler} "gcc cargo zsh git openssl-devel python3 python3-devel python3-pip libtool curl stunnel perl nghttp2 brotli" " --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr" ${branch_or_ref} curl-dev-fedora:${release_tag}
./create_dev_image.sh ${arch} ${fedora_base} ${compiler} "gcc cargo zsh git openssl-devel python3 python3-devel python3-pip libtool curl stunnel perl nghttp2 brotli libpsl-devel" " --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr" ${branch_or_ref} curl-dev-fedora:${release_tag}

##############################################
# build_alpine dev, base and appliance image
Expand Down Expand Up @@ -115,4 +115,4 @@ multibuild:
clean:
buildah rm $(container_ids)
dev:
podman-compose -f dev-compose.yml up
podman-compose -f dev-compose.yml up