diff options
author | imp <imp@FreeBSD.org> | 2014-06-06 04:09:07 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2014-06-06 04:09:07 +0000 |
commit | 0ed032933fe4bf3f047df5412d8df4df9da9c4d3 (patch) | |
tree | 59c8f747159b3db5af5ad9aa0b3246c6c9382ff5 /usr.sbin | |
parent | 76945251893ff381099d670ad70698e1b0d67285 (diff) | |
download | FreeBSD-src-0ed032933fe4bf3f047df5412d8df4df9da9c4d3.zip FreeBSD-src-0ed032933fe4bf3f047df5412d8df4df9da9c4d3.tar.gz |
When building picobsd, define WITHOUT_OPENSSL and WITHOUT_KERBEROS and
remove the now-redundant checks for RELEASE_CRUNCH. This originally
was defined for building smaller sysinstall images, but was later also
used by picobsd builds for a similar purpose. Now that we've moved
away from sysinstall, picobsd is the only remaining consumer of this
interface. Adding these two options reduces the RELEASE_CRUNCH
special cases in the tree by half.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/ntp/ntp-keygen/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/ntp/ntpd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/ppp/Makefile | 3 | ||||
-rw-r--r-- | usr.sbin/sendmail/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/tcpdump/tcpdump/Makefile | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index fea148c..78308fa 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ DPADD= ${LIBNTP} ${LIBOPTS} LDADD= ${LIBNTP} ${LIBOPTS} -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" DPADD+= ${LIBMD} ${LIBCRYPTO} LDADD+= -lmd -lcrypto .endif diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 53f537f..87b2d72 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -35,7 +35,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} ${LIBOPTS} LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd -lrt ${LIBOPTS} -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto .endif diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index a61ebf5..beea0ab 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -76,8 +76,7 @@ CFLAGS+=-DNOSUID SRCS+= id.c .endif -.if defined(RELEASE_CRUNCH) || ${MK_OPENSSL} == "no" || \ - defined(PPP_NO_DES) +.if ${MK_OPENSSL} == "no" || defined(PPP_NO_DES) CFLAGS+=-DNODES .else SRCS+= chap_ms.c mppe.c diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index f8a910b..893b6fd 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -60,7 +60,7 @@ LDADD+= ${LIBSMUTIL} ${LIBSM} SRCS+= sm_os.h CLEANFILES+=sm_os.h -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" # STARTTLS support CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 DPADD+= ${LIBSSL} ${LIBCRYPTO} diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index 4982873..fcaa13e 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -167,7 +167,7 @@ DPADD+= ${LIBCAPSICUM} ${LIBNV} LDADD+= -lcapsicum -lnv CFLAGS+=-DHAVE_LIBCAPSICUM .endif -.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH) +.if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto CFLAGS+= -I${DESTDIR}/usr/include/openssl |