[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Consolidate openssl handling to o...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d83660950eed
branches:  trunk
changeset: 365857:d83660950eed
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Jul 27 18:54:44 2017 +0000

description:
Consolidate openssl handling to options.mk. In particular, do not
pass --with-ssl to configure when the option is actually disabled.

diffstat:

 pkgtools/pkg_install/Makefile   |  14 +-------------
 pkgtools/pkg_install/options.mk |   4 +++-
 2 files changed, 4 insertions(+), 14 deletions(-)

diffs (57 lines):

diff -r 24502d8d283a -r d83660950eed pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Thu Jul 27 18:41:06 2017 +0000
+++ b/pkgtools/pkg_install/Makefile     Thu Jul 27 18:54:44 2017 +0000
@@ -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 @@
 
 .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 @@
 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 -r 24502d8d283a -r d83660950eed pkgtools/pkg_install/options.mk
--- a/pkgtools/pkg_install/options.mk   Thu Jul 27 18:41:06 2017 +0000
+++ b/pkgtools/pkg_install/options.mk   Thu Jul 27 18:54:44 2017 +0000
@@ -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 @@
 .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