From ca0c2bb3ff08a6191ef3e80a42cab9f2387dea0e Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Mon, 8 Apr 2019 13:22:53 +0300
Subject: [PATCH] libstand: Adjust zlib hadling.

Avoid crc32.c search issue in .PATH, move Makefile.stand inclusion
before sys/libkern. Add comments why.
---
 lib/libstand/Makefile   | 12 ++++++++----
 lib/libz/Makefile.stand |  2 --
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile
index 7097afbac1..eb09d6f3bf 100644
--- a/lib/libstand/Makefile
+++ b/lib/libstand/Makefile
@@ -67,8 +67,6 @@ SRCS+=	bcmp.c bcopy.c bzero.c ffs.c index.c memccpy.c memchr.c memcmp.c \
 qdivrem.o:	qdivrem.c
 	${CC} ${CFLAGS:N-flto} -c -o ${.TARGET} ${.IMPSRC}
 .endif
-.PATH:	${LIBSTAND_SRC}/../../sys/libkern
-SRCS+=  icrc32.c
 
 # _setjmp/_longjmp
 .PATH:	${LIBSTAND_SRC}/${LIBSTAND_ARCH}
@@ -78,6 +76,14 @@ CFLAGS+=-I${LIBSTAND_SRC}/../libc/${MACHINE_ARCH}
 .endif
 SRCS+=	_setjmp.S
 
+# decompression functionality from libz
+# NOTE: crc32.c is used from libz and not libkern
+.include "../libz/Makefile.stand"
+
+# iscsi_crc32() for hammer2
+.PATH:	${LIBSTAND_SRC}/../../sys/libkern
+SRCS+=  icrc32.c
+
 # decompression functionality from libbz2
 BZ2DIR=	${LIBSTAND_SRC}/../../contrib/bzip2
 .PATH:	${BZ2DIR}
@@ -93,8 +99,6 @@ ${file}: ${BZ2DIR}/${file} ${file}.diff
 	patch -o ${.TARGET} < ${.ALLSRC:M*.diff} ${.ALLSRC:M*.[ch]}
 .endfor
 
-.include "../libz/Makefile.stand"
-
 # io routines
 SRCS+=	closeall.c dev.c ioctl.c nullfs.c stat.c \
 	fstat.c close.c lseek.c open.c read.c write.c readdir.c
diff --git a/lib/libz/Makefile.stand b/lib/libz/Makefile.stand
index 40479babd4..d7437c9b7e 100644
--- a/lib/libz/Makefile.stand
+++ b/lib/libz/Makefile.stand
@@ -1,5 +1,3 @@
-# $DragonFly: src/lib/libz/Makefile.stand,v 1.4 2005/07/21 16:07:41 joerg Exp $
-
 # decompression functionality from libz for libstand
 
 # relative to lib/libstand
-- 
2.41.0