[SCM] mess system emulator branch, master, updated. 64d3b8468578281a926ef5990eae4c42cf35c3e2

[Jordi Mallach]

The following commit has been merged in the master branch:
commit 3dff572cb5bd638a72baf524a6b004a13b4b9f24
Author: Jordi Mallach <jordi at debian.org>
Date:   Tue May 22 01:38:42 2012 +0200

    Additional fixes for the Hurd.
    
    gnu_fixes.patch: Add a check for __GNU__ to fix builds on the Hurd,
    and create gnu TARGETOS definiton that defines NO_AFFINITY_NP.
    
    Stop setting TARGETOS to unix in d/rules. It should be autodetected,
    and set to linux.

diff --git a/debian/changelog b/debian/changelog
index fb31d8e..da0cf62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,10 @@ mess (0.145-1) UNRELEASED; urgency=low
 
   [ Jordi Mallach ]
   * Fix Vcs-* URLs.
-  * gnu_fixes.patch: Add a check for __GNU__ to fix builds on the Hurd.
+  * gnu_fixes.patch: Add a check for __GNU__ to fix builds on the Hurd,
+    and create gnu TARGETOS definiton that defines NO_AFFINITY_NP.
+  * Stop setting TARGETOS to unix in d/rules. It should be autodetected,
+    and set to linux.
   * Make get-orig-source target drop tarballs in the current directory,
     as policy mandates.
   * Point to the 1.0 machine-readable copyright format spec.
diff --git a/debian/patches/gnu_fixes.patch b/debian/patches/gnu_fixes.patch
index 0a4fe51..1b921d6 100644
--- a/debian/patches/gnu_fixes.patch
+++ b/debian/patches/gnu_fixes.patch
@@ -1,12 +1,13 @@
 Author: Jordi Mallach <jordi at debian.org>
 Description: Check for GNU.
- Fix builds on hurd-i386 by checking for __GNU__.
+ Fix builds on hurd-i386 by checking for __GNU__ and adding a gnu TARGETOS
+ that defines NO_AFFINITY_NP.
 Forwarded: no
 
-Index: mess-0.144/src/osd/sdl/sdlprefix.h
+Index: mess-0.145/src/osd/sdl/sdlprefix.h
 ===================================================================
---- mess-0.144.orig/src/osd/sdl/sdlprefix.h	2012-01-15 23:05:38.165375833 +0100
-+++ mess-0.144/src/osd/sdl/sdlprefix.h	2012-01-15 23:05:57.725376275 +0100
+--- mess-0.145.orig/src/osd/sdl/sdlprefix.h	2012-05-22 01:10:19.818402982 +0200
++++ mess-0.145/src/osd/sdl/sdlprefix.h	2012-05-22 01:10:24.134403145 +0200
 @@ -42,7 +42,7 @@
  /* Large file support on IRIX needs _SGI_SOURCE */
  #undef _POSIX_SOURCE
@@ -16,3 +17,35 @@ Index: mess-0.144/src/osd/sdl/sdlprefix.h
  #define SDLMAME_LINUX 1
  
  #elif defined(__FreeBSD__)
+Index: mess-0.145/makefile
+===================================================================
+--- mess-0.145.orig/makefile	2012-05-22 01:10:19.706402978 +0200
++++ mess-0.145/makefile	2012-05-22 01:23:19.302431871 +0200
+@@ -95,6 +95,9 @@
+ ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
+ TARGETOS = macosx
+ endif
++ifeq ($(firstword $(filter GNU,$(UNAME))),GNU)
++TARGETOS = gnu
++endif
+ 
+ ifndef TARGETOS
+ $(error Unable to detect TARGETOS from uname -a: $(UNAME))
+Index: mess-0.145/src/osd/sdl/sdl.mak
+===================================================================
+--- mess-0.145.orig/src/osd/sdl/sdl.mak	2012-05-22 00:57:29.000000000 +0200
++++ mess-0.145/src/osd/sdl/sdl.mak	2012-05-22 01:26:09.374438171 +0200
+@@ -201,6 +201,13 @@
+ 
+ endif
+ 
++ifeq ($(TARGETOS),gnu)
++BASE_TARGETOS = unix
++SYNC_IMPLEMENTATION = tc
++SDL_NETWORK = taptun
++DEFS += -DNO_AFFINITY_NP
++endif
++
+ ifeq ($(TARGETOS),win32)
+ BASE_TARGETOS = win32
+ SYNC_IMPLEMENTATION = win32
diff --git a/debian/rules b/debian/rules
index 05ab119..5859491 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,6 @@ DEB_MAME_OPTS = \
     SUBTARGET=mame \
     OSD=sdl \
     CROSS_BUILD_OSD= \
-    TARGETOS=unix \
     NOASM=1 \
     PREFIX= \
     SUFFIX= \

-- 
mess system emulator