View | Details | Raw Unified | Return to issue 98252
Collapse All | Expand All

(-)cairo/pixman/makefile.mk.orig (-12 / +2 lines)
Lines 94-100 Link Here
94
.ELSE
94
.ELSE
95
# ----------- Unix ---------------------------------------------------------
95
# ----------- Unix ---------------------------------------------------------
96
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
96
.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
97
LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
97
LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-z,noexecstack
98
.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
98
.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
99
99
100
.IF "$(OS)$(COM)"=="SOLARISC52"
100
.IF "$(OS)$(COM)"=="SOLARISC52"
Lines 122-134 Link Here
122
122
123
CONFIGURE_DIR=
123
CONFIGURE_DIR=
124
CONFIGURE_ACTION=.$/configure
124
CONFIGURE_ACTION=.$/configure
125
.IF "$(CPUNAME)"=="X86_64"
126
# static builds tend to fail on 64bit
127
CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
125
CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
128
.ELSE
129
# use static lib to avoid linking problems with older system pixman libs
130
CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
131
.ENDIF
132
CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
126
CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
133
BUILD_ACTION=$(GNUMAKE)
127
BUILD_ACTION=$(GNUMAKE)
134
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
128
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
Lines 151-161 Link Here
151
OUT2LIB+=pixman$/release$/*.lib
145
OUT2LIB+=pixman$/release$/*.lib
152
.ENDIF
146
.ENDIF
153
.ELSE
147
.ELSE
154
.IF "$(CPUNAME)"=="X86_64"
148
OUT2LIB+=pixman$/.libs$/libpixman-1.so*
155
OUT2LIB+=pixman$/.libs$/libpixman-1.so
156
.ELSE
157
OUT2LIB+=pixman$/.libs$/libpixman-1.a
158
.ENDIF
159
.ENDIF
149
.ENDIF
160
150
161
# --- Targets ------------------------------------------------------
151
# --- Targets ------------------------------------------------------

Return to issue 98252