merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0533-cairo-cairo-makefile-mk.diff
blobdfcc7f5fba197dce816bc402154897a79119932b
1 --- cairo/cairo/makefile.mk 2009-03-11 15:09:10.000000000 +0100
2 +++ cairo/cairo/makefile.mk 2009-03-11 15:09:31.000000000 +0100
3 @@ -106,7 +106,7 @@
4 .ELSE
5 # ----------- Unix ---------------------------------------------------------
6 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
7 -cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
8 +cairo_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
9 .ELIF "$(OS)$(COM)"=="SOLARISC52"
10 cairo_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
11 .ENDIF # "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
12 @@ -151,6 +151,11 @@
13 CONFIGURE_FLAGS+=pixman_CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc" pixman_LIBS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib -lpixman-1"
14 .ENDIF
16 +.IF "$(debug)"!=""
17 +cairo_CFLAGS+=-g
18 +CONFIGURE_FLAGS+= STRIP=" "
19 +.ENDIF
21 CONFIGURE_FLAGS+=CFLAGS="-I$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/inc $(cairo_CFLAGS)" LDFLAGS="-L$(SRC_ROOT)$/$(PRJNAME)$/$(INPATH)$/lib $(cairo_LDFLAGS)" CPPFLAGS="$(cairo_CPPFLAGS)"
23 .ENDIF