diff options
| author |   deraadt <deraadt@openbsd.org> | 2020-06-09 16:53:52 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2020-06-09 16:53:52 +0000 |
| commit | 4d97159af714fa3a4da75400501d3840d07e13c2 (patch) | |
| tree | 68ead6dcdc936ea04c31862d60c45482201fff35 | |
| parent | document REGISTER_PLIST_OPTS (diff) | |
| download | wireguard-openbsd-4d97159af714fa3a4da75400501d3840d07e13c2.tar.xz wireguard-openbsd-4d97159af714fa3a4da75400501d3840d07e13c2.zip | |
The check_includes step is incorrect dependency management model for
how our tree gets built. If this was done in all the libraries (imagine
sys/dev), it would disrupt the development process hugely. So it should
not be done here either. use 'make includes' by hand instead.
| -rw-r--r-- | lib/libcrypto/Makefile | 12 | ||||
| -rw-r--r-- | lib/libssl/Makefile | 12 | ||||
| -rw-r--r-- | lib/libtls/Makefile | 12 |
3 files changed, 3 insertions, 33 deletions
diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index 8970ca39188..9207b93f321 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2020/06/05 15:28:33 jsing Exp $ +# $OpenBSD: Makefile,v 1.42 2020/06/09 16:53:52 deraadt Exp $ LIB= crypto LIBREBUILD=y @@ -408,16 +408,6 @@ HDRS_GEN=\ prereq: obj_mac.h -check_includes: prereq - @cd ${.CURDIR}; for i in $(HDRS) $(HDRS_GEN); do \ - j="cmp -s $$i ${DESTDIR}/usr/include/openssl/`basename $$i` || \ - (echo \"`basename $$i` differs from installed version; \" \ - \"did you forget 'make includes'?\" && false)"; \ - eval "$$j"; \ - done; - -all: check_includes - includes: prereq @test -d ${DESTDIR}/usr/include/openssl || \ mkdir ${DESTDIR}/usr/include/openssl diff --git a/lib/libssl/Makefile b/lib/libssl/Makefile index d88e1e9a738..c162e84b77d 100644 --- a/lib/libssl/Makefile +++ b/lib/libssl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.65 2020/05/10 14:22:51 jsing Exp $ +# $OpenBSD: Makefile,v 1.66 2020/06/09 16:53:53 deraadt Exp $ .include <bsd.own.mk> .ifndef NOMAN @@ -86,16 +86,6 @@ HDRS= dtls1.h srtp.h ssl.h ssl2.h ssl23.h ssl3.h tls1.h .PATH: ${.CURDIR} -check_includes: - @cd ${.CURDIR}; for i in $(HDRS); do \ - j="cmp -s $$i ${DESTDIR}/usr/include/openssl/`basename $$i` || \ - (echo \"`basename $$i` differs from installed version; \" \ - \"did you forget 'make includes'?\" && false)"; \ - eval "$$j"; \ - done; - -all: check_includes - includes: @test -d ${DESTDIR}/usr/include/openssl || \ mkdir ${DESTDIR}/usr/include/openssl diff --git a/lib/libtls/Makefile b/lib/libtls/Makefile index 65b9f168d00..23a6ed1f2a4 100644 --- a/lib/libtls/Makefile +++ b/lib/libtls/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2020/01/22 08:00:46 jsing Exp $ +# $OpenBSD: Makefile,v 1.36 2020/06/09 16:53:53 deraadt Exp $ .include <bsd.own.mk> .ifndef NOMAN @@ -39,16 +39,6 @@ SRCS= tls.c \ tls_ocsp.c \ tls_verify.c -check_includes: - @cd ${.CURDIR}; for i in $(HDRS); do \ - j="cmp -s $$i ${DESTDIR}/usr/include/`basename $$i` || \ - (echo \"`basename $$i` differs from installed version; \" \ - \"did you forget 'make includes'?\" && false)"; \ - eval "$$j"; \ - done; - -all: check_includes - includes: @cd ${.CURDIR}; for i in $(HDRS); do \ j="cmp -s $$i ${DESTDIR}/usr/include/$$i || \ |