* [PATCH] mkfs.ubifs: fix build without openssl
@ 2019-03-29 10:32 Baruch Siach
2019-03-29 11:54 ` David Oberhollenzer
0 siblings, 1 reply; 2+ messages in thread
From: Baruch Siach @ 2019-03-29 10:32 UTC (permalink / raw)
To: linux-mtd; +Cc: Baruch Siach
Exclude openssl headers when WITH_CRYPTO is not defined.
Fixes this build failure:
In file included from ubifs-utils/mkfs.ubifs/mkfs.ubifs.c:25:0:
ubifs-utils/mkfs.ubifs/mkfs.ubifs.h:49:10: fatal error: openssl/rand.h: No such file or directory
#include <openssl/rand.h>
^~~~~~~~~~~~~~~~
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
ubifs-utils/mkfs.ubifs/mkfs.ubifs.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
index aa032392155b..8f0186043079 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h
@@ -46,7 +46,9 @@
#include <uuid.h>
#include <sys/file.h>
+#ifdef WITH_CRYPTO
#include <openssl/rand.h>
+#endif
#include <mtd/ubifs-media.h>
--
2.20.1
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] mkfs.ubifs: fix build without openssl
2019-03-29 10:32 [PATCH] mkfs.ubifs: fix build without openssl Baruch Siach
@ 2019-03-29 11:54 ` David Oberhollenzer
0 siblings, 0 replies; 2+ messages in thread
From: David Oberhollenzer @ 2019-03-29 11:54 UTC (permalink / raw)
To: Baruch Siach, linux-mtd
Applied to mtd-utils.git master.
Thanks,
David
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-29 11:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-29 10:32 [PATCH] mkfs.ubifs: fix build without openssl Baruch Siach
2019-03-29 11:54 ` David Oberhollenzer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).