Index: mk/bsd.incs.mk =================================================================== --- mk.orig/bsd.incs.mk +++ mk/bsd.incs.mk @@ -45,7 +45,7 @@ _${group}INS_${header:T}: ${header} ${INSTALL} -d -o ${${group}OWN_${.ALLSRC:T}} \ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} - ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \ + ${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \ ${.ALLSRC} \ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}} @@ -58,11 +58,11 @@ installincludes: _${group}INS _${group}INS: ${_${group}INCS} .if defined(${group}NAME) ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME} .else ${INSTALL} -d ${DESTDIR}${${group}DIR} - ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ + ${INSTALL} -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \ ${.ALLSRC} ${DESTDIR}${${group}DIR} .endif .endif Index: mk/bsd.lib.mk =================================================================== --- mk.orig/bsd.lib.mk +++ mk/bsd.lib.mk @@ -119,11 +119,7 @@ _LIBS= lib${LIB}.a lib${LIB}.a: ${OBJS} ${STATICOBJS} @${ECHO} building static ${LIB} library @rm -f ${.TARGET} -.if !defined(NM) - @${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} -.else - @${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD} -.endif + @${AR} cq ${.TARGET} ${OBJS} ${STATICOBJS} ${ARADD} ${RANLIB} ${.TARGET} .endif @@ -136,11 +132,7 @@ POBJS+= ${OBJS:.o=.po} ${STATICOBJS:.o= lib${LIB}_p.a: ${POBJS} @${ECHO} building profiled ${LIB} library @rm -f ${.TARGET} -.if !defined(NM) - @${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD} -.else - @${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD} -.endif + @${AR} cq ${.TARGET} ${POBJS} ${ARADD} ${RANLIB} ${.TARGET} .endif @@ -195,15 +195,9 @@ .if defined(SHLIB_LINK) @ln -fs ${.TARGET} ${SHLIB_LINK} .endif -.if !defined(NM) @${CC} ${LDFLAGS} -shared -Wl,-x \ -o ${.TARGET} -Wl,-soname,${SONAME} \ - `lorder ${SOBJS} | tsort -q` ${LDADD} -.else - @${CC} ${LDFLAGS} -shared -Wl,-x \ - -o ${.TARGET} -Wl,-soname,${SONAME} \ - `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} -.endif + `echo ${SOBJS} | xargs -n 1 echo | sort -u` ${LDADD} .if defined(CTFMERGE) ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} .endif @@ -211,13 +197,6 @@ _EXTRADEPEND: .if !target(install) -.if defined(PRECIOUSLIB) -.if !defined(NO_FSCHG) -SHLINSTALLFLAGS+= -fschg -.endif -SHLINSTALLFLAGS+= -S -.endif - _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}} @@ -233,12 +212,12 @@ realinstall: _libinstall _libinstall: .if defined(LIB) && !empty(LIB) && ${MK_INSTALLLIB} != "no" ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}.a ${DESTDIR}${LIBDIR} .endif .if ${MK_PROFILE} != "no" && defined(LIB) && !empty(LIB) ${INSTALL} -d ${DESTDIR}${LIBDIR} - ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_p.a ${DESTDIR}${LIBDIR} .endif .if defined(SHLIB_NAME) Index: mk/bsd.prog.mk =================================================================== --- mk.orig/bsd.prog.mk +++ mk/bsd.prog.mk @@ -120,13 +120,6 @@ _EXTRADEPEND: .if !target(install) -.if defined(PRECIOUSPROG) -.if !defined(NO_FSCHG) -INSTALLFLAGS+= -fschg -.endif -INSTALLFLAGS+= -S -.endif - _INSTALLFLAGS:= ${INSTALLFLAGS} .for ie in ${INSTALLFLAGS_EDIT} _INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}