[ooo-build-commit] .: 2 commits - cairo/cairo cairo/pixman

[Fridrich Strba]

 cairo/cairo/makefile.mk  |    7 ++++++-
 cairo/pixman/makefile.mk |   14 ++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit 90228ea1bb82e5b86df0fab5670e1460bc57fbdf
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 14 12:31:24 2010 +0200

    cairo-cairo-makefile-mk.diff: Fix linking of internal cairo library

diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index a290128..88953d0 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -120,7 +120,7 @@ OUT2INC+=src$/cairo-quartz.h
 .ELSE
 # ----------- Unix ---------------------------------------------------------
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
 .ELIF "$(OS)$(COM)"=="SOLARISC52"
 cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF  # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
@@ -169,6 +169,11 @@ OUT2INC+=src$/cairo-xlib.h \
 CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1"
 .ENDIF
 
+.IF "$(debug)"!=""
+cairo_CFLAGS+=-g
+CONFIGURE_FLAGS+= STRIP=" "
+.ENDIF
+
 CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)"
 
 .ENDIF
commit 7e348dfe409b482200e879586d9cc2b27268b07e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Sep 14 12:27:12 2010 +0200

    cairo-pixman-makefile-mk.diff: Build pixman as shared library on x86_64 too

diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index f3c1c09..6d2504b 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -92,7 +92,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 .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"
@@ -120,13 +120,7 @@ pixman_CFLAGS+=-fPIC
 
 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)
@@ -149,11 +143,7 @@ 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
+OUT2LIB+=pixman$/.libs$/libpixman-1.so*
 .ENDIF
 
 # --- Targets ------------------------------------------------------