From f4eb3f3ee77d9ed239de9af7605e5c06dfce0d0c Mon Sep 17 00:00:00 2001
From: Thomas Klausner <tk@giga.or.at>
Date: Wed, 13 Jan 2021 17:15:13 +0100
Subject: [PATCH 1/4] Fix build if GNU make is not called "make"

On *BSD it is usually called "gmake"
---
 Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 86e054e..eb515f2 100644
--- a/Makefile
+++ b/Makefile
@@ -15,32 +15,32 @@ endif
 
 all:
 ifeq ($(OS), Windows_NT)
-	@(objdump -a $(BINARY) 2> /dev/null | grep "pei-i386" > /dev/null || make --no-print-directory clean; exit 0)
+	@(objdump -a $(BINARY) 2> /dev/null | grep "pei-i386" > /dev/null || ${MAKE} --no-print-directory clean; exit 0)
 endif
-	@make --no-print-directory $(BINARY)
+	@${MAKE} --no-print-directory $(BINARY)
 
 64:
 ifeq ($(OS), Windows_NT)
-	@(objdump -a $(BINARY) 2> /dev/null | grep "pei-i386" > /dev/null && make --no-print-directory clean; exit 0)
-	@make --no-print-directory $(BINARY) 64=1
+	@(objdump -a $(BINARY) 2> /dev/null | grep "pei-i386" > /dev/null && ${MAKE} --no-print-directory clean; exit 0)
+	@${MAKE} --no-print-directory $(BINARY) 64=1
 else
-	@make --no-print-directory $(BINARY)
+	@${MAKE} --no-print-directory $(BINARY)
 endif
 
 clean:
 	rm -rf $(BINARY) $(CLEAN) crcutil.a *.o *.exe test.bin d1aa92b05d1f2638f423661ae4735446.bin
 
 mrproper:
-	@make --no-print-directory clean
+	@${MAKE} --no-print-directory clean
 	rm -rf test.bin *.tar.gz *.zip $(DISTNAME)-bin-win32 $(DISTNAME)-bin-win64
 
 dist:
-	make mrproper
+	${MAKE} mrproper
 	(cd ..; tar -cz --numeric-owner -f $(DISTNAME).tar.gz $(DISTNAME))
 	mv ../$(DISTNAME).tar.gz .
 ifeq ($(OS), Windows_NT)
 	mkdir $(DISTNAME)-bin-win32
-	make all
+	${MAKE} all
 	cp $(BINARY) $(DISTNAME)-bin-win32
 	cp README $(DISTNAME)-bin-win32/README.txt
 	cp COPYING $(DISTNAME)-bin-win32/COPYING.txt
@@ -48,9 +48,9 @@ ifeq ($(OS), Windows_NT)
 	unix2dos $(DISTNAME)-bin-win32/COPYING.txt
 	zip -r $(DISTNAME)-bin-win32.zip $(DISTNAME)-bin-win32
 	rm -rf $(DISTNAME)-bin-win32
-	make clean
+	${MAKE} clean
 	mkdir $(DISTNAME)-bin-win64
-	make all 64=1
+	${MAKE} all 64=1
 	cp $(BINARY) $(DISTNAME)-bin-win64
 	cp README $(DISTNAME)-bin-win64/README.txt
 	cp COPYING $(DISTNAME)-bin-win64/COPYING.txt
@@ -58,7 +58,7 @@ ifeq ($(OS), Windows_NT)
 	unix2dos $(DISTNAME)-bin-win64/COPYING.txt
 	zip -r $(DISTNAME)-bin-win64.zip $(DISTNAME)-bin-win64
 	rm -rf $(DISTNAME)-bin-win64
-	make clean
+	${MAKE} clean
 endif
 
 test: $(BINARY) test.bin

From 001f71869e22e8b69385a1b8a8de8c0da15db0cf Mon Sep 17 00:00:00 2001
From: Thomas Klausner <tk@giga.or.at>
Date: Wed, 13 Jan 2021 17:16:07 +0100
Subject: [PATCH 2/4] Include <cerrno> for errno symbol

---
 findcrcs.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/findcrcs.cc b/findcrcs.cc
index 87863ef..306f5d7 100644
--- a/findcrcs.cc
+++ b/findcrcs.cc
@@ -33,6 +33,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <cerrno>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>

From 808fa6b4abc6af8d87fb8887e917fda9bd6e494a Mon Sep 17 00:00:00 2001
From: Thomas Klausner <tk@giga.or.at>
Date: Thu, 4 Feb 2021 09:40:36 +0100
Subject: [PATCH 3/4] Use CXXFLAGS and LDFLAGS.

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index eb515f2..2de7386 100644
--- a/Makefile
+++ b/Makefile
@@ -69,12 +69,12 @@ test: $(BINARY) test.bin
 	@sh -c "time ./$(BINARY) test.bin 1000000 13fbda0d"
 
 $(BINARY): findcrcs.cc md5.c md5.h crcutil-1.0 crcutil.a
-	$(BINPREFIX)g++ -O3 -D_FILE_OFFSET_BITS=64 -Wall -o $@ $(EXEFLAGS) findcrcs.cc md5.c crcutil.a -Icrcutil-1.0/code -Icrcutil-1.0/examples
+	$(BINPREFIX)g++ -O3 -D_FILE_OFFSET_BITS=64 -Wall -o $@ $(EXEFLAGS) $(CXXFLAGS) $(LDFLAGS) findcrcs.cc md5.c crcutil.a -Icrcutil-1.0/code -Icrcutil-1.0/examples
 	$(BINPREFIX)strip -s $@
 
 crcutil.a: crcutil-1.0
 	rm -rf *.o
-	$(BINPREFIX)g++ -O3 -Wall -mcrc32 -c crcutil-1.0/examples/interface.cc crcutil-1.0/code/*.cc -Icrcutil-1.0/code -Icrcutil-1.0/tests -Icrcutil-1.0/examples
+	$(BINPREFIX)g++ -O3 -Wall $(CXXFLAGS) -c crcutil-1.0/examples/interface.cc crcutil-1.0/code/*.cc -Icrcutil-1.0/code -Icrcutil-1.0/tests -Icrcutil-1.0/examples
 	$(BINPREFIX)ar r crcutil.a *.o
 	rm -rf *.o
 

From 7d9adf337d219f6adaeb711ed48f22b3e9596b99 Mon Sep 17 00:00:00 2001
From: Thomas Klausner <tk@giga.or.at>
Date: Mon, 12 Apr 2021 16:18:36 +0200
Subject: [PATCH 4/4] Use errno.h instead of cerrno

---
 findcrcs.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/findcrcs.cc b/findcrcs.cc
index 306f5d7..7b97e93 100644
--- a/findcrcs.cc
+++ b/findcrcs.cc
@@ -33,7 +33,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <cerrno>
+#include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>