diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 12:27:12 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-14 12:27:12 +0200 |
| commit | 399cb3be848ab06592cf5eb6951787701b2b801d (patch) | |
| tree | a41928f67e6b8210ab72d13b6fdd3249c3faf99a /cairo | |
| parent | 29ef0ee01df5a2042bdb7544d602718b5689329f (diff) | |
cairo-pixman-makefile-mk.diff: Build pixman as shared library on x86_64 too
Diffstat (limited to 'cairo')
| -rw-r--r-- | cairo/pixman/makefile.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk index f3c1c091639c..6d2504b6fbb8 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 ------------------------------------------------------ |