diff options
| author | Remko van der Vossen | 2022-12-02 06:45:14 +0100 |
|---|---|---|
| committer | Remko van der Vossen | 2022-12-02 06:45:14 +0100 |
| commit | bdaad393feddce716fa7c8fb4db0d8dd6112cd5d (patch) | |
| tree | 6cf05b4f851fbf9aeceafc9c74c4edb94632b77d /ftp | |
| parent | 6df3e6d81ed4f59560228e4544d89de75da88ca6 (diff) | |
curl: add SSL sub depends
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/curl/HISTORY | 4 | ||||
| -rwxr-xr-x | ftp/curl/PRE_SUB_DEPENDS | 5 | ||||
| -rwxr-xr-x | ftp/curl/REPAIR^all^PRE_SUB_DEPENDS (renamed from ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS) | 5 | ||||
| -rwxr-xr-x | ftp/curl/SUB_DEPENDS | 8 |
4 files changed, 22 insertions, 0 deletions
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY index 9f557024ea..41d18c58c6 100644 --- a/ftp/curl/HISTORY +++ b/ftp/curl/HISTORY @@ -1,3 +1,7 @@ +2022-12-02 Remko van der Vossen <wich@sourcemage.org> + * SUB_DEPENDS, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS: + add SSL sub depends + 2022-12-01 Remko van der Vossen <wich@sourcemage.org> * CONFIGURE, DEPENDS: use optional_depends_one_of for SSL library selection diff --git a/ftp/curl/PRE_SUB_DEPENDS b/ftp/curl/PRE_SUB_DEPENDS index b76a3f0d05..6993a86abd 100755 --- a/ftp/curl/PRE_SUB_DEPENDS +++ b/ftp/curl/PRE_SUB_DEPENDS @@ -1,6 +1,11 @@ case $THIS_SUB_DEPENDS in ARES) is_depends_enabled $SPELL c-ares;; NO_ARES) is_depends_enabled $SPELL c-ares || return 0;; + SSL) is_depends_enabled $SPELL gnutls \ + || is_depends_enabled $SPELL openssl \ + || is_depends_enabled $SPELL libressl \ + || is_depends_enabled $SPELL mbedtls \ + || is_depends_enabled $SPELL wolfssl ;; *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" return 1;; esac diff --git a/ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS b/ftp/curl/REPAIR^all^PRE_SUB_DEPENDS index b76a3f0d05..6993a86abd 100755 --- a/ftp/curl/REPAIR^fe459d4206227d8985f1a62feba54335^PRE_SUB_DEPENDS +++ b/ftp/curl/REPAIR^all^PRE_SUB_DEPENDS @@ -1,6 +1,11 @@ case $THIS_SUB_DEPENDS in ARES) is_depends_enabled $SPELL c-ares;; NO_ARES) is_depends_enabled $SPELL c-ares || return 0;; + SSL) is_depends_enabled $SPELL gnutls \ + || is_depends_enabled $SPELL openssl \ + || is_depends_enabled $SPELL libressl \ + || is_depends_enabled $SPELL mbedtls \ + || is_depends_enabled $SPELL wolfssl ;; *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" return 1;; esac diff --git a/ftp/curl/SUB_DEPENDS b/ftp/curl/SUB_DEPENDS index 26976f92d2..2c64b9e3e0 100755 --- a/ftp/curl/SUB_DEPENDS +++ b/ftp/curl/SUB_DEPENDS @@ -3,6 +3,14 @@ case $THIS_SUB_DEPENDS in depends c-ares "--enable-ares=$INSTALL_ROOT/usr" ;; NO_ARES) message "Curl without c-ares requested, forcing disabled c-ares dependency" && optional_depends c-ares "--disable-ares" ;; + SSL) message "Curl with SSL requested, forcing SSL library dependency" && + depends_one_of CURL_SSL \ + gnutls '--with-ssl --with-gnutls --without-openssl --without-nss --without-mbedtls --without-wolfssl' \ + openssl '--with-ssl --without-gnutls --with-openssl --without-nss --without-mbedtls --without-wolfssl' \ + libressl '--with-ssl --without-gnutls --with-openssl --without-nss --without-mbedtls --without-wolfssl' \ + mbedtls '--with-ssl --without-gnutls --without-openssl --without-nss --with-mbedtls --without-wolfssl' \ + wolfssl '--with-ssl --without-gnutls --without-openssl --without-nss --without-mbedtls --with-wolfssl' \ + 'SSL library' ;; *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" return 1 ;; esac |