On 2018-W08-1 20:17 -0700, Constantine A. Murenin wrote:
I think 0fe46dc6 may have broken `make nativekernel`.


For the archives, I've tried doing nativekernel on the 5.0.2 live
image (DragonFly 5.0-RELEASE x86_64):

In file included from /usr/src/sys/bus/cam/cam_xpt.c:40:0:
/usr/src/sys/sys/md5.h:45:25: fatal error: openssl/md5.h: No such file or 
directory
compilation terminated.

It seems that this would only happen if you try to `make nativekernel` after unpacking the `/usr/src-sys.tar.bz2` (e.g., via `make release-sys-extract` on 5.0.2 live image), due to `-I/usr/src/sys/../crypto/libressl/include` and the missing non-sys src. Still happens in master, although 2018-02-06 live image doesn't include the src-sys.tar.bz2 archive.

Another way of fixing this would be to make sure to include 
`/usr/src/crypto/libressl/include` as part of the src-sys.tar.bz2.

http://bxr.su/DragonFly/nrelease/Makefile#240

Patch attached.

C.
>From b17d94cc197d48f4c3bcb9c2bc18ae7ead07e59e Mon Sep 17 00:00:00 2001
From: "Constantine A. Murenin" <cnst+d...@bugmail.mojo.ru>
Date: Tue, 20 Feb 2018 17:40:57 +0000
Subject: [PATCH] nrelease: fix nativekernel build via release-sys-extract,
 openssl/md5.h related to 0fe46dc6 / d9ccbcc9

---
 nrelease/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index ee8dfeff1..fcfd372cc 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -238,7 +238,7 @@ srcs:
        rm -f ${ISOROOT}/usr/src-sys.tgz
        rm -f ${ISOROOT}/usr/src-sys.tar.bz2
        cd ${.CURDIR}/.. && tar --exclude .git -s '/^\./src/' \
-               -cf - ./Makefile ./Makefile.inc1 ./sys | \
+               -cf - ./Makefile ./Makefile.inc1 ./crypto/libressl/include 
./sys | \
                bzip2 -9 > ${ISOROOT}/usr/src-sys.tar.bz2
 .endif
 .endif
-- 
2.15.1

Reply via email to