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/nut | |
| 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/nut')
| -rw-r--r-- | package/nut/Makefile | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/package/nut/Makefile b/package/nut/Makefile index 20139d653..fa9152eba 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -14,16 +14,22 @@ PKG_SITES:= http://www.networkupstools.org/source/2.7/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_FLAVOURS_NUT:= WITH_SSL WITH_SNMP WITH_USB +PKG_FLAVOURS_NUT:= WITH_SNMP WITH_USB PKGFD_WITH_SNMP:= enable snmp support PKGFS_WITH_SNMP:= libnetsnmp PKGFB_WITH_SNMP:= net-snmp PKGFD_WITH_USB:= enable usb support PKGFS_WITH_USB:= libusb libusb-compat PKGFB_WITH_USB:= libusb libusb-compat -PKGFD_WITH_SSL:= enable ssl support -PKGFS_WITH_SSL:= libopenssl -PKGFB_WITH_SSL:= openssl + +PKG_CHOICES_NUT:= 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 @@ -81,7 +87,12 @@ CONFIGURE_ARGS+= --with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \ --with-group=0 \ --with-user=0 -ifneq (${ADK_PACKAGE_NUT_WITH_SSL},) +ifeq (${ADK_PACKAGE_NUT_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-ssl +CONFIGURE_ENV+= CPPFLAGS="${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}" +MAKE_FLAGS+= SSL_CFLAGS="${TARGET_CPPFLAGS}" SSL_LDFLAGS="${TARGET_LDFLAGS} -lssl -lcrypto" +endif +ifeq (${ADK_PACKAGE_NUT_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl CONFIGURE_ENV+= CPPFLAGS="${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}" MAKE_FLAGS+= SSL_CFLAGS="${TARGET_CPPFLAGS}" SSL_LDFLAGS="${TARGET_LDFLAGS} -lssl -lcrypto" |