diff options
| author | tnn <tnn@pkgsrc.org> | 2017-07-27 18:54:44 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2017-07-27 18:54:44 +0000 |
| commit | 97f01bb0b1ba3d2155ad536c1848390670cfb663 (patch) | |
| tree | 88a0cddac99ce0a6cba67afd32071143497878c2 /pkgtools | |
| parent | d73418ce11da560bd5f8b68362b28ce162a9e441 (diff) | |
| download | pkgsrc-97f01bb0b1ba3d2155ad536c1848390670cfb663.tar.gz | |
Consolidate openssl handling to options.mk. In particular, do not
pass --with-ssl to configure when the option is actually disabled.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 14 | ||||
| -rw-r--r-- | pkgtools/pkg_install/options.mk | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 7f884cff169..aa809fd711c 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.221 2017/04/20 14:38:40 joerg Exp $ +# $NetBSD: Makefile,v 1.222 2017/07/27 18:54:44 tnn Exp $ # Notes to package maintainers: # @@ -114,12 +114,6 @@ BUILDLINK_API_DEPENDS.libarchive+= libarchive>=3.3.1 .include "options.mk" -.if !empty(USE_BUILTIN.openssl:M[yY][eE][sS]) -CONFIGURE_ARGS+= --with-ssl - -.include "../../security/openssl/buildlink3.mk" -.endif - .if empty(USE_BUILTIN.bzip2:M[yY][eE][sS]) || \ empty(USE_BUILTIN.zlib:M[yY][eE][sS]) USE_BUILTIN.libarchive= no @@ -143,12 +137,6 @@ LDFLAGS+= -L${WRKDIR}/zlib CPPFLAGS+= -I${WRKDIR}/libarchive/libarchive LDFLAGS+= -L${WRKDIR}/libarchive/.libs -# Until we support pkgsrc openssl at bootstrap time, disable it completely -# if asked to avoid the builtin. -. if empty(USE_BUILTIN.openssl:M[Yy][Ee][Ss]) -LIBARCHIVE_CONFIGURE_ARGS+= --without-openssl -. endif - # Only use XZ if we actually have builtin support for it. Some systems # install the header, but without usable library or prefer to not use # the system version, so give them some control. diff --git a/pkgtools/pkg_install/options.mk b/pkgtools/pkg_install/options.mk index e268f2c1fed..00657934b20 100644 --- a/pkgtools/pkg_install/options.mk +++ b/pkgtools/pkg_install/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2012/07/27 13:50:43 jperkin Exp $ +# $NetBSD: options.mk,v 1.5 2017/07/27 18:54:44 tnn Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libfetch PKG_SUPPORTED_OPTIONS= inet6 openssl @@ -19,10 +19,12 @@ MAKE_ENV+= FETCH_WITH_INET6=no .endif .if !empty(PKG_OPTIONS:Mopenssl) +CONFIGURE_ARGS+= --with-ssl MAKE_ENV+= FETCH_WITH_OPENSSL=yes LDFLAGS+= -lssl -lcrypto .include "../../security/openssl/buildlink3.mk" .else +LIBARCHIVE_CONFIGURE_ARGS+= --without-openssl MAKE_ENV+= FETCH_WITH_OPENSSL=no .endif |