spk-build-fixes.patch

From a7a69e8dc87504163222ba2570bda6920114a5c3 Mon Sep 17 00:00:00 2001
From: Craig Ringer <craig@redacted>
Date: Sun, 26 Jun 2016 19:58:48 +0800
Subject: [PATCH] SPK utils build fixes

---
 .gitignore          | 4 ++++
 src/SPK/File_IO.cpp | 2 ++
 src/SPK/Makefile    | 9 +++++----
 src/SPK/String.h    | 3 +++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ecd7049
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.o
+/spkconvert
+/spktool
+/src/SPK/Makefile.bak
diff --git a/src/SPK/File_IO.cpp b/src/SPK/File_IO.cpp
index e451afa..7cd8a32 100755
--- a/src/SPK/File_IO.cpp
+++ b/src/SPK/File_IO.cpp
@@ -1,5 +1,7 @@
 #include "File_IO.h"
 
+#include <unistd.h>
+
 CFileIO::CFileIO ()
 {
 	m_bOpened = false;
diff --git a/src/SPK/Makefile b/src/SPK/Makefile
index de509cf..1de445e 100644
--- a/src/SPK/Makefile
+++ b/src/SPK/Makefile
@@ -26,9 +26,6 @@ default: dep $(OUT)
 .cpp.o:
 	$(CCC) $(INCLUDES) $(CCFLAGS) -c $< -o $@
 
-libz.a:
-	make -C zlib -f Makefile
-
 lib7.a:
 	make -C ansi7zip -f Makefile
 
@@ -76,7 +73,11 @@ File.o: /usr/include/unistd.h /usr/include/bits/posix_opt.h
 File.o: /usr/include/bits/confname.h SpkFile.h lists.h /usr/include/stdlib.h
 File.o: /usr/include/alloca.h /usr/include/bits/stdlib-float.h CatFile.h
 File.o: File_IO.h
-File_IO.o: File_IO.h String.h
+File_IO.o: File_IO.h String.h /usr/include/unistd.h /usr/include/features.h
+File_IO.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h
+File_IO.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
+File_IO.o: /usr/include/bits/posix_opt.h /usr/include/bits/types.h
+File_IO.o: /usr/include/bits/typesizes.h /usr/include/bits/confname.h
 MultiSpkFile.o: MultiSpkFile.h String.h SpkFile.h lists.h
 MultiSpkFile.o: /usr/include/stdlib.h /usr/include/features.h
 MultiSpkFile.o: /usr/include/stdc-predef.h /usr/include/sys/cdefs.h
diff --git a/src/SPK/String.h b/src/SPK/String.h
index 8d65d9f..aaf671f 100755
--- a/src/SPK/String.h
+++ b/src/SPK/String.h
@@ -7,6 +7,9 @@
 
 #define NullString String("")
 #include <string>
+#include <cstring>
+#include <cstdlib>
+#include <cstdio>
 
 #ifdef QT_DLL
 #include <qstring.h>
-- 
2.5.5