merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0532-cairo-pixman-makefile-mk.diff
blob24f98391ed11ff11241a68e5c7e10afe6b637cf8
1 --- cairo/pixman/makefile.mk
2 +++ cairo/pixman/makefile.mk
3 @@ -89,7 +89,7 @@
4 .ELSE
5 # ----------- Unix ---------------------------------------------------------
6 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
7 -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
8 +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
9 .ENDIF # "$(OS)$(COM)"=="LINUXGCC"
11 .IF "$(OS)$(COM)"=="SOLARISC52"
12 @@ -135,7 +135,7 @@
13 .ENDIF
14 .ELSE
15 .IF "$(CPUNAME)"=="X86_64"
16 -OUT2LIB+=pixman$/.libs$/libpixman-1.so
17 +OUT2LIB+=pixman$/.libs$/libpixman-1.so*
18 .ELSE
19 OUT2LIB+=pixman$/.libs$/libpixman-1.a
20 .ENDIF