Date: Tue, 22 Nov 2011 20:05:22 +0000 From: Rui Paulo <rpaulo@FreeBSD.org> To: Dag-Erling Smorgrav <des@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r227797 - head/share/mk Message-ID: <4A740CCF-AB73-41E3-B2C6-344B4A067B00@FreeBSD.org> In-Reply-To: <201111211635.pALGZvSS051067@svn.freebsd.org> References: <201111211635.pALGZvSS051067@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
With this change, I can no longer update a FreeBSD 9.0-current system = from June 2010 to FreeBSD 10.0. I suspect I'm not the only one. On 2011/11/21, at 16:35, Dag-Erling Smorgrav wrote: > Author: des > Date: Mon Nov 21 16:35:57 2011 > New Revision: 227797 > URL: http://svn.freebsd.org/changeset/base/227797 >=20 > Log: > As threatened on -arch, add {SHARED,STATIC}_{C,CXX}FLAGS, which allow = a > Makefile to specify different CFLAGS for shared and static libraries. >=20 > MFC after: 3 weeks >=20 > Modified: > head/share/mk/bsd.lib.mk >=20 > Modified: head/share/mk/bsd.lib.mk > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/share/mk/bsd.lib.mk Mon Nov 21 16:06:23 2011 = (r227796) > +++ head/share/mk/bsd.lib.mk Mon Nov 21 16:35:57 2011 = (r227797) > @@ -67,23 +67,29 @@ PICFLAG=3D-fpic >=20 > PO_FLAG=3D-pg >=20 > +.c.o: > + ${CC} ${STATIC_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} > + > .c.po: > - ${CC} ${PO_FLAG} ${PO_CFLAGS} -c ${.IMPSRC} -o ${.TARGET} > + ${CC} ${PO_FLAG} ${STATIC_CFLAGS} ${PO_CFLAGS} -c ${.IMPSRC} -o = ${.TARGET} > @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \ > (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ > ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) >=20 > .c.So: > - ${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} > + ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} = -o ${.TARGET} > @[ -z "${CTFCONVERT}" -o -n "${NO_CTF}" ] || \ > (${ECHO} ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \ > ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}) >=20 > +.cc.o: > + ${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o = ${.TARGET} > + > .cc.po .C.po .cpp.po .cxx.po: > - ${CXX} ${PO_FLAG} ${PO_CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} > + ${CXX} ${PO_FLAG} ${STATIC_CXXFLAGS} ${PO_CXXFLAGS} -c = ${.IMPSRC} -o ${.TARGET} >=20 > .cc.So .C.So .cpp.So .cxx.So: > - ${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} > + ${CXX} ${PICFLAG} -DPIC ${SHARED_CXXFLAGS} ${CXXFLAGS} -c = ${.IMPSRC} -o ${.TARGET} >=20 > .f.po: > ${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC} > _______________________________________________ > svn-src-head@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to = "svn-src-head-unsubscribe@freebsd.org" Regards, -- Rui Paulo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4A740CCF-AB73-41E3-B2C6-344B4A067B00>