diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2022-10-14 17:09:44 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-10-14 17:09:44 +0000 |
| commit | de4cc48814c8adea6f52ec9a5621432705dc7a7e (patch) | |
| tree | ed4cbcbe347612429c9ee3210076d1d18cf7c5d1 /regress | |
| parent | cce0e8551cf5a836f890fecdfd543f410fe6ed4e (diff) | |
Revert kn's Makefile surgery. It no longer does what it was supposed
to do and I'm still not clear what it was supposed to fix.
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.sbin/rpki-client/Makefile | 9 | ||||
| -rw-r--r-- | regress/usr.sbin/rpki-client/openssl11/Makefile | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/regress/usr.sbin/rpki-client/Makefile b/regress/usr.sbin/rpki-client/Makefile index 59b61c7bf6d..54afb1963bf 100644 --- a/regress/usr.sbin/rpki-client/Makefile +++ b/regress/usr.sbin/rpki-client/Makefile @@ -1,6 +1,13 @@ -# $OpenBSD: Makefile,v 1.11 2021/11/08 23:06:49 kn Exp $ +# $OpenBSD: Makefile,v 1.12 2022/10/14 17:09:43 tb Exp $ SUBDIR += libressl +.if exists(/usr/local/bin/eopenssl11) SUBDIR += openssl11 +.else +.END: + @echo 'Run "pkg_add openssl--%1.1" to run tests against OpenSSL 1.1' + @echo SKIPPED +.endif .include <bsd.subdir.mk> +.include <bsd.regress.mk> diff --git a/regress/usr.sbin/rpki-client/openssl11/Makefile b/regress/usr.sbin/rpki-client/openssl11/Makefile index f9a0eae1ce2..c7215cd7e32 100644 --- a/regress/usr.sbin/rpki-client/openssl11/Makefile +++ b/regress/usr.sbin/rpki-client/openssl11/Makefile @@ -1,9 +1,3 @@ -.if ! exists(/usr/local/bin/eopenssl11) -regress: - @echo 'Run "pkg_add openssl--%1.1" to run tests against OpenSSL 1.1' - @echo SKIPPED -.endif - LDADD += -Wl,-rpath,/usr/local/lib/eopenssl11 -L/usr/local/lib/eopenssl11 CFLAGS += -I${.CURDIR}/ -I/usr/local/include/eopenssl11/ CFLAGS += -DLIBRESSL_INTERNAL |