ooo-build r15525 - in trunk: . patches/dev300

[strba svn gnome org]

Author: strba
Date: Wed Mar 11 15:52:21 2009
New Revision: 15525
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15525&view=rev

Log:
just wondering where these options came from 

Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cairo-pixman-makefile-mk.diff

Modified: trunk/patches/dev300/cairo-pixman-makefile-mk.diff
==============================================================================
--- trunk/patches/dev300/cairo-pixman-makefile-mk.diff	(original)
+++ trunk/patches/dev300/cairo-pixman-makefile-mk.diff	Wed Mar 11 15:52:21 2009
@@ -1,5 +1,14 @@
 --- cairo/pixman/makefile.mk	2009-03-05 10:22:54.000000000 +0100
 +++ cairo/pixman/makefile.mk	2009-03-05 10:23:25.000000000 +0100
+@@ -89,7 +89,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 @@
  OUT2LIB+=pixman$/release$/*.lib
  .ENDIF