Skip to content

Commit

Permalink
Merge pull request #48 from curl/bagder/libpsl
Browse files Browse the repository at this point in the history
Makefile: add libpsl to the build
  • Loading branch information
xquery committed Jan 16, 2024
2 parents 2ec6a43 + ade2648 commit 9414d81
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile
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

0 comments on commit 9414d81

Please sign in to comment.