| Message ID | 20200629175109.94276-1-gert@greenie.muc.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] Fix 'engine' unit test on FreeBSD (specifically 'not GNU make') | expand |
On Mon, 2020-06-29 at 19:51 +0200, Gert Doering wrote: > The rules to generate $(builddir)/openssl.cnf from > $(srcdir)/openssl.cnf.in only worked for GNU Make. BSD make needs > the rules more explicit, and the target must not have a directory > specification (fixes commit 542c69c37). This definitely works for me on Linux. James
Patch has been applied to the master branch.
commit 8a168a9ac82c197725091f67fb5812d4b64050d8
Author: Gert Doering
Date: Mon Jun 29 19:51:09 2020 +0200
Fix 'engine' unit test on FreeBSD (specifically 'not GNU make')
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Message-Id: <20200629175109.94276-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20159.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/tests/unit_tests/engine-key/Makefile.am b/tests/unit_tests/engine-key/Makefile.am index 0bfdfcd4..24622251 100644 --- a/tests/unit_tests/engine-key/Makefile.am +++ b/tests/unit_tests/engine-key/Makefile.am @@ -21,8 +21,8 @@ CLEANFILES = \ log.txt \ $(conffiles) -$(builddir)/openssl.cnf: $(srcdir)/openssl.cnf.in - sed "s|ABSBUILDDIR|$(abs_builddir)|" < $< > $@ +openssl.cnf: $(srcdir)/openssl.cnf.in + sed "s|ABSBUILDDIR|$(abs_builddir)|" < $(srcdir)/openssl.cnf.in > $@ libtestengine_la_SOURCES = libtestengine.c libtestengine_la_LDFLAGS = @TEST_LDFLAGS@ -rpath /lib -shrext .so
The rules to generate $(builddir)/openssl.cnf from $(srcdir)/openssl.cnf.in only worked for GNU Make. BSD make needs the rules more explicit, and the target must not have a directory specification (fixes commit 542c69c37). Signed-off-by: Gert Doering <gert@greenie.muc.de> --- tests/unit_tests/engine-key/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)