1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116
|
Author: Jordi Mallach <jordi@debian.org>
Description: Several FTBFS fixes for Hurd systems.
Forwarded: no
Index: mame/makefile
===================================================================
--- mame.orig/makefile
+++ mame/makefile
@@ -228,6 +228,8 @@ GENIEOS := bsd
else ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
OS := freebsd
GENIEOS := freebsd
+else ifeq ($(firstword $(filter GNU,$(UNAME))),GNU)
+OS := gnu
else ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
OS := netbsd
GENIEOS := freebsd
@@ -1287,6 +1289,16 @@ linux: generate $(PROJECTDIR)/$(MAKETYPE
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)
+.PHONY: gnu_x86
+gnu_x86: generate $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)32 precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)32
+
+.PHONY: gnu
+gnu: generate $(PROJECTDIR)/$(MAKETYPE)-linux/Makefile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)
+
#-------------------------------------------------
# gmake-linux-clang
#-------------------------------------------------
Index: mame/src/osd/sdl/sdlprefix.h
===================================================================
--- mame.orig/src/osd/sdl/sdlprefix.h
+++ mame/src/osd/sdl/sdlprefix.h
@@ -40,7 +40,7 @@
/* Large file support on IRIX needs _SGI_SOURCE */
#undef _POSIX_SOURCE
-#elif defined(__linux__) || defined(__FreeBSD_kernel__)
+#elif defined(__linux__) || defined(__GNU__) || defined(__FreeBSD_kernel__)
#define SDLMAME_LINUX 1
#elif defined(__FreeBSD__)
Index: mame/src/osd/modules/file/posixfile.cpp
===================================================================
--- mame.orig/src/osd/modules/file/posixfile.cpp
+++ mame/src/osd/modules/file/posixfile.cpp
@@ -42,6 +42,12 @@
#define _DARWIN_C_SOURCE
#endif
+#if defined(__GNU__)
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+#endif
+
// MAME headers
#include "posixfile.h"
#include "osdcore.h"
Index: mame/src/osd/modules/file/posixptty.cpp
===================================================================
--- mame.orig/src/osd/modules/file/posixptty.cpp
+++ mame/src/osd/modules/file/posixptty.cpp
@@ -27,6 +27,9 @@
#include <util.h>
#elif defined(__linux__) || defined(__EMSCRIPTEN__)
#include <pty.h>
+#elif defined(__GNU__)
+#include <pty.h>
+#include <termios.h>
#elif defined(__HAIKU__)
#include <bsd/pty.h>
#elif defined(__sun)
@@ -35,6 +38,11 @@
#include <sys/conf.h>
#endif
+#if defined(__GNU__)
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
+#endif
namespace {
Index: mame/scripts/genie.lua
===================================================================
--- mame.orig/scripts/genie.lua
+++ mame/scripts/genie.lua
@@ -150,6 +150,7 @@ newoption {
{ "netbsd", "NetBSD" },
{ "openbsd", "OpenBSD" },
{ "linux", "Linux" },
+ { "gnu", "GNU" },
{ "macosx", "OSX" },
{ "windows", "Windows" },
{ "haiku", "Haiku" },
Index: mame/scripts/src/osd/sdl.lua
===================================================================
--- mame.orig/scripts/src/osd/sdl.lua
+++ mame/scripts/src/osd/sdl.lua
@@ -219,6 +219,9 @@ if _OPTIONS["targetos"]=="windows" then
SDLOS_TARGETOS = "win32"
elseif _OPTIONS["targetos"]=="macosx" then
SDLOS_TARGETOS = "macosx"
+elseif _OPTIONS["targetos"]=="gnu" then
+ SDL_NETWORK = "taptun"
+ SYNC_IMPLEMENTATION = "tc"
end
if BASE_TARGETOS=="unix" then
|