3 files changed, 22 insertions, 3 deletions
diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index b8533c8cc5f9..454f234176e0 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -7,8 +7,8 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo
  
 -PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
 -PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
-+PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman-0.12.0/pixman
-+PIXMAN_LIBS := $(top_builddir)/../pixman-0.12.0/pixman/$(CFG)/pixman-1.lib
++PIXMAN_CFLAGS := -I$(SRC_ROOT)/cairo/$(INPATH)/inc
++PIXMAN_LIBS := $(SRC_ROOT)/cairo/$(INPATH)/lib/pixman-1.lib
  
  CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
  ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 73d3a27f9493..59a3a3538e9d 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -125,6 +125,10 @@ LDFLAGS:=$(cairo_LDFLAGS)
 cairo_CFLAGS+=-xc99=none
 .ENDIF
 
+.IF "$(CPU)"=="I"
+cairo_CFLAGS+=-march=i486
+.ENDIF
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
 CONFIGURE_FLAGS=--enable-xlib --enable-ft --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index b33d02ffc731..93ce36623222 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -109,11 +109,22 @@ LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ld
 pixman_CFLAGS+=-xc99=none
 .ENDIF
 
+.IF "$(CPU)"=="I"
+pixman_CFLAGS+=-march=i486
+.ENDIF
+
 pixman_CFLAGS+=-fPIC
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes CFLAGS="$(pixman_CFLAGS)"
+.IF "$(CPUNAME)"=="X86_64"
+# static builds tend to fail on 64bit
+CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
+.ELSE
+# use static lib to avoid linking problems with older system pixman libs
+CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
+.ENDIF
+CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -135,7 +146,11 @@ OUT2LIB+=pixman$/.libs$/*.a
 OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
 .ELSE
+.IF "$(CPUNAME)"=="X86_64"
 OUT2LIB+=pixman$/.libs$/libpixman-1.so
+.ELSE
+OUT2LIB+=pixman$/.libs$/libpixman-1.a
+.ENDIF
 .ENDIF
 
 # --- Targets ------------------------------------------------------