From ef92d70f970b923bf1a2daaa37c8a2b9b3729f6d Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Tue, 9 Jun 2020 16:53:53 +0000 Subject: 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. --- src/lib/libcrypto/Makefile | 12 +----------- src/lib/libssl/Makefile | 12 +----------- src/lib/libtls/Makefile | 12 +----------- 3 files changed, 3 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/Makefile b/src/lib/libcrypto/Makefile index 8970ca3918..9207b93f32 100644 --- a/src/lib/libcrypto/Makefile +++ b/src/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/src/lib/libssl/Makefile b/src/lib/libssl/Makefile index d88e1e9a73..c162e84b77 100644 --- a/src/lib/libssl/Makefile +++ b/src/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 .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/src/lib/libtls/Makefile b/src/lib/libtls/Makefile index 65b9f168d0..23a6ed1f2a 100644 --- a/src/lib/libtls/Makefile +++ b/src/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 .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 || \ -- cgit v1.2.3-55-g6feb