svn commit: r349991 - in head/usr.sbin: ntp wpa

[Warner Losh]

Author: imp
Date: Mon Jul 15 07:39:28 2019
New Revision: 349991
URL: https://svnweb.freebsd.org/changeset/base/349991

Log:
  MK_OPENSSL makes RELEASE_CRUNCH redundant here
  
  Since these things are more completely controlled by the MK_OPENSSL knob, remove
  RELEASE_CRUNCH here. It's no longer needed for the release and other users can
  use the more proper knob if they so desire.

Modified:
  head/usr.sbin/ntp/Makefile.inc
  head/usr.sbin/wpa/Makefile.crypto

Modified: head/usr.sbin/ntp/Makefile.inc
==============================================================================
--- head/usr.sbin/ntp/Makefile.inc	Mon Jul 15 07:35:46 2019	(r349990)
+++ head/usr.sbin/ntp/Makefile.inc	Mon Jul 15 07:39:28 2019	(r349991)
@@ -10,7 +10,7 @@ NTPDEFS=   -DSYS_FREEBSD
 #	-DMX4200 -DNMEA -DBOEDER
 CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
 
-.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no"
 CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY
 .endif
 

Modified: head/usr.sbin/wpa/Makefile.crypto
==============================================================================
--- head/usr.sbin/wpa/Makefile.crypto	Mon Jul 15 07:35:46 2019	(r349990)
+++ head/usr.sbin/wpa/Makefile.crypto	Mon Jul 15 07:39:28 2019	(r349991)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
+.if ${MK_OPENSSL} != "no"
 SRCS+=	crypto_openssl.c random.c sha1-prf.c sha256-prf.c sha256-tlsprf.c \
 	sha512.c
 LIBADD+=	ssl crypto