Skip to contentSkip to conversation

Fix 'engine' unit test on FreeBSD (specifically 'not GNU make')

PATCH In review Gert Doering 2 participants 3 messages Jun 29, 2020 – Jul 1, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix 'engine' unit test on FreeBSD (specifically 'not GNU make')

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).

---
 tests/unit_tests/engine-key/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/unit_tests/engine-key/Makefile.am +2 -2
index 0bfdfcd4..24622251 100644
@@ -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
Signature · 1 line
2.27.0
#1 lore raw
Quoted 4 lines · Gert Doering

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

#2 lore raw
In reply to Gert Doering

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 <[email protected]...>
     Acked-by: James Bottomley <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg20159.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering