diff options
author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-28 19:04:37 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-30 21:18:09 +0200 |
commit | 4237c9d899a7e5dfb9d62644601bcbfa1574ab82 (patch) | |
tree | ccb7b6d3fe16110c0dbc0648ca5c7760ab6d2b31 /package/nginx | |
parent | f9be3a73d76d5cf4f8b07cbbff925872927a1eaa (diff) |
remove OpenSSL support
I thought some time about this, we have it in parallel some time and
it have issues for allmodconfig builds.
Anyway I have no fun doing openssl updates twice a week.
We just can not support stunnel/ssltunnel anymore.
For nodejs we use bundled openssl.
I am an old OpenBSD geek anyway, so get rid of OpenSSL.
Diffstat (limited to 'package/nginx')
-rw-r--r-- | package/nginx/Makefile | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/package/nginx/Makefile b/package/nginx/Makefile index 3e6b44ccf..0b99d462e 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -17,21 +17,19 @@ PKG_SITES:= http://nginx.org/download/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_CHOICES_NGINX:= WITHOUT_SSL WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITHOUT_SSL:= use no ssl +PKG_CHOICES_NGINX:= WITH_LIBRESSL WITHOUT_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 +PKGCD_WITHOUT_SSL:= use no ssl include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,NGINX,nginx,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -CONFIG_STYLE:= minimal TARGET_CFLAGS+= -fPIC + +CONFIG_STYLE:= minimal CONFIGURE_ENV+= ngx_force_gcc_have_atomic=yes \ ngx_force_have_libatomic=no CONFIGURE_ARGS:= --prefix=/srv/www \ @@ -51,9 +49,6 @@ CONFIGURE_ARGS:= --prefix=/srv/www \ --http-scgi-temp-path=/var/lib/nginx/uwsgi \ --http-uwsgi-temp-path=/var/lib/nginx/uwsgi -ifeq ($(ADK_PACKAGE_NGINX_WITH_OPENSSL),y) -CONFIGURE_ARGS+= --with-http_ssl_module -endif ifeq ($(ADK_PACKAGE_NGINX_WITH_LIBRESSL),y) CONFIGURE_ARGS+= --with-http_ssl_module endif |