Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 426838 | Differences between
and this patch

Collapse All | Expand All

(-)share.orig/mk/bsd.lib.mk (-24 / +3 lines)
Lines 155-165 Link Here
155
lib${LIB}.a: ${OBJS} ${STATICOBJS}
155
lib${LIB}.a: ${OBJS} ${STATICOBJS}
156
	@${ECHO} building static ${LIB} library
156
	@${ECHO} building static ${LIB} library
157
	@rm -f ${.TARGET}
157
	@rm -f ${.TARGET}
158
.if !defined(NM)
158
	@${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD}
159
	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
160
.else
161
	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
162
.endif
163
	${RANLIB} ${.TARGET}
159
	${RANLIB} ${.TARGET}
164
.endif
160
.endif
165
161
Lines 172-182 Link Here
172
lib${LIB}_p.a: ${POBJS}
168
lib${LIB}_p.a: ${POBJS}
173
	@${ECHO} building profiled ${LIB} library
169
	@${ECHO} building profiled ${LIB} library
174
	@rm -f ${.TARGET}
170
	@rm -f ${.TARGET}
175
.if !defined(NM)
171
	@${AR} cq ${.TARGET} ${POBJS} ${ARADD}
176
	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
177
.else
178
	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
179
.endif
180
	${RANLIB} ${.TARGET}
172
	${RANLIB} ${.TARGET}
181
.endif
173
.endif
182
174
Lines 203-217 Link Here
203
.if defined(SHLIB_LINK)
195
.if defined(SHLIB_LINK)
204
	@ln -fs ${.TARGET} ${SHLIB_LINK}
196
	@ln -fs ${.TARGET} ${SHLIB_LINK}
205
.endif
197
.endif
206
.if !defined(NM)
207
	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
198
	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
208
	    -o ${.TARGET} -Wl,-soname,${SONAME} \
199
	    -o ${.TARGET} -Wl,-soname,${SONAME} \
209
	    `lorder ${SOBJS} | tsort -q` ${LDADD}
200
	    `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD}
210
.else
211
	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
212
	    -o ${.TARGET} -Wl,-soname,${SONAME} \
213
	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
214
.endif
215
	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
201
	@[ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || \
216
		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
202
		(${ECHO} ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} && \
217
		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
203
		${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS})
Lines 259-271 Link Here
259
245
260
.if !target(install)
246
.if !target(install)
261
247
262
.if defined(PRECIOUSLIB)
263
.if !defined(NO_FSCHG)
264
SHLINSTALLFLAGS+= -fschg
265
.endif
266
SHLINSTALLFLAGS+= -S
267
.endif
268
269
_INSTALLFLAGS:=	${INSTALLFLAGS}
248
_INSTALLFLAGS:=	${INSTALLFLAGS}
270
.for ie in ${INSTALLFLAGS_EDIT}
249
.for ie in ${INSTALLFLAGS_EDIT}
271
_INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
250
_INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
(-)share.orig/mk/bsd.prog.mk (-7 lines)
Lines 134-146 Link Here
134
134
135
.if !target(install)
135
.if !target(install)
136
136
137
.if defined(PRECIOUSPROG)
138
.if !defined(NO_FSCHG)
139
INSTALLFLAGS+= -fschg
140
.endif
141
INSTALLFLAGS+= -S
142
.endif
143
144
_INSTALLFLAGS:=	${INSTALLFLAGS}
137
_INSTALLFLAGS:=	${INSTALLFLAGS}
145
.for ie in ${INSTALLFLAGS_EDIT}
138
.for ie in ${INSTALLFLAGS_EDIT}
146
_INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}
139
_INSTALLFLAGS:=	${_INSTALLFLAGS${ie}}

Return to bug 426838