diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2024-04-23 09:43:48 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2024-04-23 09:43:48 +0200 |
| commit | 2eb80576380dc5652315d618aa7e5be2b1441132 (patch) | |
| tree | 558e7900dbeff0af41a345c7392acd5e6b2c3db0 /package/lynx | |
| parent | f47b9eaf15f76d898ad31bdb6b1d1eaa6a4b702b (diff) | |
lynx: update to 2.9.1, add ssl choice
Diffstat (limited to 'package/lynx')
| -rw-r--r-- | package/lynx/Makefile | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/package/lynx/Makefile b/package/lynx/Makefile index f5488dc1f..945096303 100644 --- a/package/lynx/Makefile +++ b/package/lynx/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= lynx -PKG_VERSION:= 2.9.0 +PKG_VERSION:= 2.9.1 PKG_RELEASE:= 1 -PKG_HASH:= 746c926e28d50571a42d2477f9c50784b27fc8cba4c7db7f3e6c9e00dde89070 +PKG_HASH:= 085fb3924b8684485c6be1b1ca745417da6ace768f94428ead95caf9dd8b56b7 PKG_DESCR:= text browser PKG_SECTION:= app/browser -PKG_DEPENDS:= libncurses zlib libressl -PKG_BUILDDEP:= ncurses zlib libressl +PKG_DEPENDS:= libncurses zlib +PKG_BUILDDEP:= ncurses zlib PKG_URL:= https://lynx.invisible-island.net/ PKG_SITES:= https://invisible-island.net/archives/lynx/tarballs/ PKG_NOPARALLEL:= 1 @@ -18,13 +18,42 @@ PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/$(PKG_NAME)$(PKG_VERSION) +PKG_CHOICES_LYNX:= WITH_LIBRESSL WITH_OPENSSL WITH_GNUTLS WITHOUT_SSL +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCS_WITH_LIBRESSL:= libressl ca-certificates +PKGCB_WITH_LIBRESSL:= libressl +PKGCD_WITH_OPENSSL:= use libopenssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates +PKGCB_WITH_OPENSSL:= openssl +PKGCD_WITH_GNUTLS:= use gnutls for crypto +PKGCS_WITH_GNUTLS:= libgnutls ca-certificates +PKGCB_WITH_GNUTLS:= gnutls +PKGCD_WITHOUT_SSL:= use no ssl + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LYNX,lynx,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl -TARGET_CPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT -HOST_CFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT +#TARGET_CPPFLAGS+= -I${STAGING_TARGET_DIR}/include/openssl +#TARGET_CPPFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT +#HOST_CFLAGS+= -DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT + +ifeq (${ADK_PACKAGE_LYNX_WITH_LIBRESSL},y) +CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ + --without-gnutls +endif +ifeq (${ADK_PACKAGE_LYNX_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-ssl="${STAGING_TARGET_DIR}/usr" \ + --without-gnutls +endif +ifeq (${ADK_PACKAGE_LYNX_WITH_GNUTLS},y) +CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \ + --without-ssl +endif +ifeq (${ADK_PACKAGE_LYNX_WITHOUT_SSL},y) +CONFIGURE_ARGS+= --without-ssl \ + --without-gnutls +endif CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \ ac_cv_path_TN3270=tn3270 \ @@ -43,7 +72,6 @@ CONFIGURE_ENV+= ac_cv_path_TELNET=telnet \ ac_cv_path_NCURSES_CONFIG=${STAGING_TARGET_DIR}/usr/bin/ncurses5-config CONFIGURE_ARGS+= --disable-warnings \ - --without-gnutls \ --without-socks \ --without-socks5 \ --enable-addrlist-page \ @@ -60,7 +88,6 @@ CONFIGURE_ARGS+= --disable-warnings \ --without-bzlib \ --without-x \ --with-zlib=${STAGING_TARGET_DIR}/usr \ - --with-ssl=${STAGING_TARGET_DIR}/usr \ --with-curses-dir=${STAGING_TARGET_DIR}/usr \ --disable-full-paths \ --with-cfg-file=/etc/lynx.cfg \ |