[libx86] add patch from debian for ftbfs

[Dennis Gilmore]

commit 04967691d72415ffc8b70a06d778563e526c0c1b
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Jun 24 09:55:00 2014 -0500

    add patch from debian for ftbfs

 libx86-libc-test.patch |   39 +++++++++++++++++++++++++++++++++++++++
 libx86.spec            |    9 ++++++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/libx86-libc-test.patch b/libx86-libc-test.patch
new file mode 100644
index 0000000..a62da4a
--- /dev/null
+++ b/libx86-libc-test.patch
@@ -0,0 +1,39 @@
+diff -Naur libx86-1.1+ds1.orig/Makefile libx86-1.1+ds1/Makefile
+--- libx86-1.1+ds1.orig/Makefile	2008-05-19 12:28:59.000000000 +0300
++++ libx86-1.1+ds1/Makefile	2012-02-20 01:32:03.750068423 +0200
+@@ -5,6 +5,7 @@
+ ifeq ($(BACKEND),x86emu)
+ 	OBJECTS += thunk.o x86emu/decode.o x86emu/debug.o x86emu/fpu.o \
+ 	x86emu/ops.o x86emu/ops2.o x86emu/prim_ops.o x86emu/sys.o
++	CFLAGS += -DX86EMU
+ else
+ 	OBJECTS += lrmi.o
+ endif
+diff -Naur libx86-1.1+ds1.orig/thunk.c libx86-1.1+ds1/thunk.c
+--- libx86-1.1+ds1.orig/thunk.c	2008-04-03 03:48:00.000000000 +0300
++++ libx86-1.1+ds1/thunk.c	2012-02-20 01:12:56.468820192 +0200
+@@ -32,6 +32,7 @@
+ #define TRUE 1
+ #define FALSE 0
+ 
++#ifndef X86EMU
+ #define __BUILDIO(bwl,bw,type) \
+ static inline void out##bwl##_local(unsigned long port, unsigned type value) {        __asm__ __volatile__("out" #bwl " %" #bw "0, %w1" : : "a"(value), "Nd"(port)); \
+ }\
+@@ -44,6 +45,15 @@
+ __BUILDIO(b,b,char)
+ __BUILDIO(w,w,short)
+ __BUILDIO(l,,int)
++#else
++/* use libc functions */
++#define inb_local inb
++#define inw_local inw
++#define inl_local inl
++#define outb_local outb
++#define outw_local outw
++#define outl_local outl
++#endif /* X86EMU */
+ 
+ 
+ char *mmap_addr = SHMERRORPTR;
+
diff --git a/libx86.spec b/libx86.spec
index 71ae780..61d5908 100644
--- a/libx86.spec
+++ b/libx86.spec
@@ -1,6 +1,6 @@
 Name:           libx86
 Version:        1.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Library for making real-mode x86 calls
 
 Group:          System Environment/Libraries
@@ -14,6 +14,9 @@ ExcludeArch:    ppc ppc64 s390 s390x %{sparc}
 
 Patch0: libx86-add-pkgconfig.patch
 Patch1: libx86-mmap-offset.patch
+# patch from  https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=34;filename=libx86-libc-test.patch.txt;att=1;bug=570676
+# debian control portion removed as it fails to apply and we do not need it anyway
+Patch2: libx86-libc-test.patch
 
 %description
 A library to provide support for making real-mode x86 calls with an emulated
@@ -32,6 +35,7 @@ development of programs that will use libx86 to make real-mode x86 calls.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -62,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/x86.pc
 
 %changelog
+* Tue Jun 24 2014 Dennis Gilmore <dennis at ausil.us> - 1.1-18
+- add patch from debian for ftbfs
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild