diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-10-20 07:58:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-10-22 22:31:26 +0200 |
| commit | 26e2aca4359bc7cff080c8446a67b838a5026d15 (patch) | |
| tree | 404eafc8d39d46286fc41118e9d511f873b6ce8d /package/elinks | |
| parent | 75114af47a5f090b59b80d511472493b93c2e2c6 (diff) | |
ssl: rework ssl support
Use libressl as default, where SSL is required.
Allow to choose openssl.
Disable SSL where not strictly required to build.
Diffstat (limited to 'package/elinks')
| -rw-r--r-- | package/elinks/Makefile | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/package/elinks/Makefile b/package/elinks/Makefile index 75717a2ac..5e7f0b719 100644 --- a/package/elinks/Makefile +++ b/package/elinks/Makefile @@ -9,8 +9,6 @@ PKG_RELEASE:= 3 PKG_HASH:= 94dc254cdecddee51819ae17962d9e606690bee3ec43fb43c635cb40197b4bc7 PKG_DESCR:= advanced text web browser PKG_SECTION:= app/browser -PKG_DEPENDS:= libopenssl -PKG_BUILDDEP:= openssl PKG_URL:= http://elinks.or.cz/ PKG_SITES:= http://elinks.or.cz/download/ PKG_NOPARALLEL:= 1 @@ -20,6 +18,15 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_FLAVOURS_ELINKS:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support +PKG_CHOICES_ELINKS:= WITHOUT_SSL WITH_LIBRESSL WITH_OPENSSL +PKGCD_WITHOUT_SSL:= use no ssl +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCB_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl ca-certificates +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCB_WITH_OPENSSL:= openssl +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates + include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,ELINKS,elinks,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -30,7 +37,6 @@ CONFIGURE_ENV+= $(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=ye CONFIGURE_ENV+= $(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes CONFIGURE_ARGS+= --enable-small \ --enable-256-colors \ - --with-openssl='${STAGING_TARGET_DIR}/usr' \ --disable-backtrace \ --disable-data \ --disable-formhist \ @@ -57,6 +63,16 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif +ifeq ($(ADK_PACKAGE_ELINKS_WITH_OPENSSL),y) +CONFIGURE_ARGS+= --with-openssl='${STAGING_TARGET_DIR}/usr' +endif +ifeq ($(ADK_PACKAGE_ELINKS_WITH_LIBRESSL),y) +CONFIGURE_ARGS+= --with-openssl='${STAGING_TARGET_DIR}/usr' +endif +ifeq ($(ADK_PACKAGE_ELINKS_WITHOUT_SSL),y) +CONFIGURE_ARGS+= --without-openssl +endif + do-install: ${INSTALL_DIR} ${IDIR_ELINKS}/usr/bin ${INSTALL_BIN} ${WRKBUILD}/src/elinks ${IDIR_ELINKS}/usr/bin/ |