[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300

[Fridrich Strba]

 patches/dev300/cairo-pixman-makefile-mk.diff |   34 ++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 8 deletions(-)

New commits:
commit 4af3f9270843b42c61704d1c83f151998057a1f3
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Sat Jan 16 00:18:28 2010 +0100

    Don't treat x86_64 and i386 differently
    
    * patches/dev300/cairo-pixman-makefile-mk.diff: build shared pixman
    for all linux configurations. It is possible to patch out the packaging
    of cairo and pixman and rely at the end on the fact that modern Linux
    distributions have a compatible cairo version. But since almost no Linux
    distribution apart GoOoLinux uses internal cairo, it will be a bit moot
    question for them.

diff --git a/patches/dev300/cairo-pixman-makefile-mk.diff b/patches/dev300/cairo-pixman-makefile-mk.diff
index 24f9839..4dff36c 100644
--- a/patches/dev300/cairo-pixman-makefile-mk.diff
+++ b/patches/dev300/cairo-pixman-makefile-mk.diff
@@ -1,20 +1,38 @@
---- cairo/pixman/makefile.mk
-+++ cairo/pixman/makefile.mk
-@@ -89,7 +89,7 @@
+--- cairo/pixman/makefile.mk.orig	2010-01-15 07:15:15.000000000 +0100
++++ cairo/pixman/makefile.mk	2010-01-15 20:06:00.000000000 +0100
+@@ -94,7 +94,7 @@
  .ELSE
  # ----------- Unix ---------------------------------------------------------
  .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
 -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
 +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
  .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
-
+ 
  .IF "$(OS)$(COM)"=="SOLARISC52"
-@@ -135,7 +135,7 @@
+@@ -122,13 +122,7 @@
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure
+-.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)
+@@ -151,11 +145,7 @@
+ OUT2LIB+=pixman$/release$/*.lib
  .ENDIF
  .ELSE
- .IF "$(CPUNAME)"=="X86_64"
+-.IF "$(CPUNAME)"=="X86_64"
 -OUT2LIB+=pixman$/.libs$/libpixman-1.so
+-.ELSE
+-OUT2LIB+=pixman$/.libs$/libpixman-1.a
+-.ENDIF
 +OUT2LIB+=pixman$/.libs$/libpixman-1.so*
- .ELSE
- OUT2LIB+=pixman$/.libs$/libpixman-1.a
  .ENDIF
+ 
+ # --- Targets ------------------------------------------------------