Attachment 101924 Details for Bug 197190

[patch] Fix INT10 compiler options.

xorg-xserver-ia64-int10.diff (text/plain), 2.23 KB, created by Matthias Hopf on 2006-10-18 15:51:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Hopf

Created: 2006-10-18 15:51:16 UTC

Size: 2.23 KB

patch

obsolete

>diff -urp hw/xfree86/int10.orig/Makefile.am hw/xfree86/int10/Makefile.am
>--- hw/xfree86/int10.orig/Makefile.am	2006-07-21 23:12:40.000000000 +0000
>+++ hw/xfree86/int10/Makefile.am	2006-10-18 13:53:39.000000000 +0000
>@@ -13,8 +13,12 @@ COMMON_SOURCES = \
> 	xf86int10.c \
> 	xf86int10module.c
> 
>+if I386_VIDEO
>+I386_VIDEO_CFLAGS = -D_PC
>+endif
>+
> if INT10_VM86
>-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>+AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> INCLUDES = $(XORG_INCS)
> libint10_la_SOURCES = \
> 	$(COMMON_SOURCES) \
>@@ -23,7 +27,8 @@ libint10_la_SOURCES = \
> endif
> 
> if INT10_X86EMU
>-AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>+AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
>+	    $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
> libint10_la_SOURCES = \
> 	$(COMMON_SOURCES) \
>@@ -33,7 +38,7 @@ libint10_la_SOURCES = \
> endif
> 
> if INT10_STUB
>-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>+AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
> libint10_la_SOURCES = stub.c xf86int10module.c
> endif
> 
>diff -urp hw/xfree86/int10.orig/Makefile.in hw/xfree86/int10/Makefile.in
>--- hw/xfree86/int10.orig/Makefile.in	2006-09-29 15:10:16.000000000 +0000
>+++ hw/xfree86/int10/Makefile.in	2006-10-18 13:53:39.000000000 +0000
>@@ -555,9 +561,12 @@ COMMON_SOURCES = \
> 	xf86int10.c \
> 	xf86int10module.c
> 
>-@INT10_STUB_TRUE@AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>-@INT10_VM86_TRUE@AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>-@INT10_X86EMU_TRUE@AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>+@I386_VIDEO_TRUE@I386_VIDEO_CFLAGS = -D_PC
>+@INT10_STUB_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>+@INT10_VM86_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>+@INT10_X86EMU_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
>+@INT10_X86EMU_TRUE@	    $(XORG_CFLAGS) $(EXTRA_CFLAGS)
>+
> @INT10_VM86_TRUE@INCLUDES = $(XORG_INCS)
> @INT10_X86EMU_TRUE@INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
> @INT10_STUB_TRUE@libint10_la_SOURCES = stub.c xf86int10module.c

Actions: View | Diff

Attachments on bug 197190: 95237 | 95238 | 101924 | 102483 | 102484 | 102536 | 104308 | 109281 | 110177 | 124590